[rhel7-branch 1/2] Fix problems with the hdiso method (#1274855)