Merge "Updated the OpenStack plugins"