Ratings are now included on merchantInfo objects
S8670: updated rating.java to set field type
Merged in S8670. Release version 1.7.18
Merge branch 'master' into S11889

Conflicts:
	client/pom.xml
	model/pom.xml
	pom.xml