Updated to BuildMaster SDK 4.0
SDK changes
Resolved merge