Merge branch 'master' into el6
Merge branch 'master' into el6

Conflicts:
	openstack-keystone.spec
missing newline

From Jan van Eldik <Jan.van.Eldik@cern.ch>

iniparse is not appending newline at EOF when new section is added

rhbz#809260
keystone essex rc2
Essex release
Merge branch 'master' into el6
use parallel installed version of python-paste-deploy
add required build deps on parallel installed packages
fix source URL
fix source URL
add lookup for correct version of python-routes
start the services later in the boot sequence

After mysql (64), qpid (85) and libvirtd (97) at least
Updated patches from master-patches and spec cleanup

- drop dependencies no longer needed by Essex
- drop db-setup and config-set scripts,
  generic versions are now provided by openstack-utils
Merge branch 'master' into el6

Conflicts:
	openstack-keystone.spec
run openstack-config in the 'build' rather than the 'prep'

so that one can run prep independently of BuildRequires.
(idea by pbrady from openstack-glance)
python-keystone-auth-token subpackage

rhbz#824034
use reserved user id for keystone

reserved in setup RPM rhbz#752842
folsom-1 milestone
fix paste.deploy dependency

parallel installed versions are loaded in keystone package,
so import paste.deploy after keystone in keystone-all

rhbz#826120
Merge branch 'f17' into el6

Conflicts:
	openstack-keystone.spec