Per the comment in the script, this basically automates the process at:

    http://docs.openstack.org/developer/keystone/developing.html

A Keystone auth plugin is on the horizon, and we'll need this to test
it.

Manual testing suggests this is working; need to add some automated
tests.

The CLI now tries keystone auth if basic auth is unavailable.

This includes a small modification to the `keystone.sh` script, to add
some additional data.

This also moves the scripts for the apache integration tests to a
subdirectory, since they're no longer the only ones.

Regrettably, This also includes a large number of lines where trailing
whitespace was removed, which obscures the diff somewhat. My editor does
this automatically, so it can be somewhat difficult to avoid.

Per @henn's request.

...rather than keystone master.

mitaka doesn't seem to work; @henn suggested this tag instead.