Rename 'bookshelf' upstream to 's3'

This keeps consistent with existing notations (e.g., Erchef
configuration parameters)