VP-297: Upgrade Infusion to the latest FLUID-4907 branch