branches: 1.7.18; 1.7.24;Change remaining instances of ${RELEASEDIR}/${MACHINES} to${RELEASEDIR}/${RELEASEMACHINEDIR}