Add missing @Param annotations to CityRepository in Data REST sample

Without the @Param annotations, using either of the search URIs would
resulted in a 400 response and an error describing the lack of @Param
annotation.

See gh-1627
Add tests to Data REST sample for search operations

Closes gh-1627
Merge branch 'gh-1627' into 1.1.x
Merge branch '1.1.x'