Sync glance-api.conf template with upstream again
Ceph support for Glance
 - Integration with new barclamp-ceph
Merge pull request #148 from mjura/release/roxy/ceph-support

Ceph support for Glance / roxy branch
Merge pull request #166 from vuntz/havana-sync

Sync glance-api.conf template with upstream again