Merge proposals dependent on lp://qastaging/~bkerensa/openstack-manuals/fix-for-920457

lp://qastaging/~bkerensa/openstack-manuals/fix-for-920457 has no merge proposals.