Fixing aggregateJavadoc
fix duplicate row keys for nodes on us-west-1 and us-west-2 due the usage of Java's hashcode to compute the keys.
Merge pull request #240 from timiblossom/1.1

fix duplicate row keys for nodes on us-west-1 and us-west-2
Merge branch '1.1'
[Gradle Release Plugin] - pre tag commit:  '1.2.13'.
[Gradle Release Plugin] - new version commit:  '1.2.14-SNAPSHOT'.
change log statement
Make build script happy
Add VPC support to Priam via configuration property
First step in supporting commit log archives. Adding properties to configure the CL backup,
and write them out.
Merge pull request #244 from jasobrown/1.1

First step in supporting commit log archives

reviewed by @sloke and @timiblossom
Merge branch '1.1'

Conflicts:
	gradle.properties
	priam/src/main/java/com/netflix/priam/IConfiguration.java
	priam/src/main/java/com/netflix/priam/defaultimpl/PriamConfiguration.java
	priam/src/test/java/com/netflix/priam/FakeConfiguration.java
[Gradle Release Plugin] - pre tag commit:  '1.2.14'.
[Gradle Release Plugin] - new version commit:  '1.2.15-SNAPSHOT'.
YAGPH (yet another gradle.properties hack)
Merging VPC related changes to Master
Merge remote-tracking branch 'build/multi-project' into 1.1
fix netflix-specific import of aws sdk
Aligning dependencies
Merge pull request #245 from quidryan/master

Aligning dependencies to httpcomponents 4.2.2

Looks good, hence merging.