Merge proposals dependent on lp:~cisco-openstack/puppet-openstack-cisco/icehouse-puppet-apache

1. icehouse-puppet-apache
2. Dependent merge proposals