Sync glance-api.conf template with upstream again
Merge pull request #166 from vuntz/havana-sync

Sync glance-api.conf template with upstream again