Fixes an error for common client named OpenStack (not common)

Change-Id: I89ddbf8f418e27f5768a002ee8999e08dde887bf
Merge "Fixes an error for common client named OpenStack (not common)"