Updated to OpenStack standards

Change-Id: Idf87a63c72bfb85de713ebb69564509f8c00393b