Merge remote-tracking branch 'upstream/2.1' into 2.1
Merge remote-tracking branch 'upstream/2.1' into 2.1
Restlet Defect 936834: Error in EDM generated proxy class. Some entities having error for the property which name is same as java reserved keyword.
Add query parameter on request header.

Tested by setting measurment system in request header
rename method setAddParameters() to setParameters
Merge pull request #15 from akshay-harale/2.1

Restlet Defect 936834: Error in EDM generated proxy class. Some entities having error for the property which name is same as java reserved keyword.
Merge pull request #16 from rajnikumari/2.1



Add query parameter in request header.
Tested by setting measurment system in request header