Merge refactoring
Add uri builders for options requests
Organize imports in TestGreetingsClient. Update the CHANGELOG. Bump minor version number.