Merge pull request #1530 from CarlosManias/java-fix-tests-and-cleanup

Java fix tests and cleanup
Updated getHeader() to selectively retrieve header parameters.

Updated getHeader() to selectively retrieve header parameters.
Merge pull request #1531 from CarlosManias/java-fix-tests-and-cleanup

Extract serviceMappingKeys to a method
Merge remote-tracking branch 'origin/2.0.0-alpha' into java-fix-tests-and-cleanup