Merge branch 'bug/JAL-3065_DH_keyPair_Exception_nogroovysettings' into releases/Relea...