Move to Icehouse

Now that a stable/havana branch of puppet_openstack_builder has been
cut, we need to move the default settings to Icehouse in the master
branch.  This commit does that.

Change-Id: I026e0cb1b932c71db433f65df76a0fae5a824fee
Merge "Move to Icehouse"
Merge branch 'master' of https://github.com/stackforge/puppet_openstack_builder

Conflicts:
	install-scripts/cisco.install.sh