This commit adds upstream commits: 312c7c952cbb3f20bcb1092db9bfbb51485fcebd adc7ec170d429b6b8cdeb302c8afa96fbd3ba907 in order to squash an alpha blocker. See https://bugzilla.redhat.com/show_bug.cgi?id=727501