Merge proposals dependent on lp:~justin-fathomdb/openstack-manuals/doc-reserve-metadata-prefix

1. doc-reserve-metadata-prefix
2. Dependent merge proposals