OPENAM-5122, FR-542, merged from trunk into 12.0.x
OPENAM-5122, FR-542, merged from 11.0.x into trunk.
OPENAM-5122, FR-542 11.0.x
Fix for OPENAM-467 - review: CR-3384 Using HttpURLConnectionManager wherever possible to ensure timeouts are always properly configured.
Fix for AME-202 - review: CR-802