Fix for OPENAM-1629, review CR-3902: OPENAM-1629: Return value of String.trim() is not used
Fix for AME-208 - review: CR-817