Fix path to keystone-manage

Porting commit dc16c7ca30a1b9bd34f3adb2a1708eb0f018293f to the
master branch
Remove extraneous whitespace
Add dib cherry-pick for Horizon
Cherry-picks to support horizon element

The Horizon element has some dependencies to cherry-pick cleanly.
Cherry-pick Horizon element

Until the Horizon element merges upstream, cherry-pick it in
install.sh so we can use it for the demo.
Install mariadb-devel

The new Horizon element requires it
Add Horizon to control image build
Use actual hostname

If the undercloud node's hostname is not undercloud-live, putting
127.0.0.1 undercloud-live in the hosts files breaks rabbitmq.  We
should be able to use the actual hostname there.
Undo accidental change in images.sh

A couple of temporary local changes snuck in with a previous
commit.  This reverts those.
Remove broken element script

There is a problem with the 52-force-text-mode-console script in
the d-i-b base element.  It has been fixed upstream, but not in a
way we can cherry-pick, and we don't need the script anyway so
just remove it on install.
Add script to configure the overcloud.

(cherry picked from commit 60a45fc96f9eff5dc6945d4a9b2731b21ccd7ef2)
Add apache2 element to horizon image build
Remove some unnecessary changes

These changes were obsoleted by changes elsewhere.
Merge branch 'master' into slagle/package

Conflicts:
	bin/common.sh
	bin/images.sh
Merge updates from master.