Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/stackforge/puppet_openstack_builder
Merge remote-tracking branch 'origin/coi-development'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/coi-development'
Prep h.0 release

Alter branch/repo locations for production.
Merge branch 'master' of https://github.com/CiscoSystems/puppet_openstack_builder into coi-development