Make keystone config consistent with other elements.

The keystone element had its config seperated into a
seperate element, which was inconsistent with other
openstack service elements.

This change brings it into line with nova/glance/etc.

Change-Id: I37962e22e32a90824f1c91b1fc6a61435b8b83e7
Merge "Make keystone config consistent with other elements."