Merge "Uplift deployment code for Fuel 8.0" into stable/brahmaputra