[master/rhel7-branch] Fixes inspired by bug 1085201