Icehouse changes from https://github.com/plumgrid/puppet-neutron/tree/fawadk_dev

Signed-off-by: salmank <salmank@plumgrid.com>