Fix for OPENAM-2644, review CR-1994.
Fix for failing OpenAM Postcommit jenkins build and update to test for change made in commons dependency
Fix for OPENAM-2306 review CR-1445.