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

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