Add back missing stuff from Cisco branch

The cobbler branch of CiscoSystems/puppet_openstack_builder
was accidentally based off of stackforge/puppet_openstack_builder
instead of CiscoSystems/puppet_openstack_builder, so it's missing
a few things.  This patch adds most of them back.