Improved fix of [CXF-5571], enabled broken test
Recording .gitmergeinfo Changes
Backmerging NPE fix
Recording .gitmergeinfo Changes