Fixing aggregateJavadoc
YAGPH (yet another gradle.properties hack)
Merge remote-tracking branch 'build/multi-project' into 1.1
fix netflix-specific import of aws sdk
Aligning dependencies to httpcomponents 4.2.2
Merge pull request #246 from sagarl/1.1

Aligning dependencies to httpcomponents 4.2.2
fixing the build version
Merge branch '1.1'

Conflicts:
	build.gradle
	gradle.properties