Merge proposals dependent on lp://staging/~gandelman-a/keystone/manpage-fix

lp://staging/~gandelman-a/keystone/manpage-fix has no merge proposals.