Merge branch 'master' of https://github.com/openstack/sahara into storm-integration

Change-Id: I650e98ed1cc9f4e5a3e1aac197a4b464c9951bc8
Merge branch 'storm-integration' of https://github.com/tellesnobrega/storm_plugin into storm-integration