Merge branch 'bug/JAL-1570_unable-to-add-JABAWS-Server-which-fails-validation' into...