Merge branch 'mmw/JAL-4199-web-services-testing' into development/Release_2_12_Branch