Merge branch 'release/1.0.0-final'
Merge branch 'release/1.1.0'
Fixed bug in HttpClient that meant the path wasn't being generated correctly for paths that contain port numbers.
Bumped version to 1.1.1-final
updating poms for 1.1.1-final hotfix
Merge remote-tracking branch 'origin/hotfix/clientpath' into hotfix/1.1.1-final

Conflicts:
	pom.xml
updating poms for 1.1.1-final hotfix
updating poms for 1.1.1-final hotfix
updating develop with hotfix versions to avoid merge conflicts
Merge branch 'hotfix/1.1.1-final' into develop