Merge branch 'testpaches/JAL-2719_JAL-1264_testfails' into tasks/JAL-3070_wsinterfaces