Merge proposals

tripleo-common-bugs has no merge proposals.