fix for broken build #383
Merge remote-tracking branch 'origin/CONNECT_integration' into CONN-133
CONN-207: CXF 2.7.3 upgrade changes
Merge pull request #411 from nareshcgi/CONN-207

CONN-207: CXF 2.7.3 upgrade changes
CONNECT-133:PatientCorrelation unit test coverage
Merge remote-tracking branch 'origin/CONNECT_integration' into CONN-133