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

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