Merge "Upgraded SDK and CXF versions"