Feature/icehouse compatible

This is the change for compatibility with new OICR Openstack (Icehouse). 
The change was tested against both the new and old openstacks with Bindle2, hence the lack of checkboxes for the json templates. 

This also entails an update to the vagrant-openstack-provider version