update maven-surefire-plugin dependency version to 2.16, maven-javadoc-plugin to 2.9.1
update guava dependency version to 15.0
update jclouds dependency version to 1.6.0
fix merge conflicts