Merge branch '4_7_x' of https://github.com/xtuple/xtuple into i24559_xtlocks