Restore Object API name 'object-store'

It's used in the service catalog, doh!

Change-Id: If8f6db49c84756fd8e58cc68910160da4cd99b5d