Moray updates

Updated used for MANTA-2315 work in node-moray.