Merge branch 'develop' into feature/configure-http-pool-size

Conflicts:
	app/com/m3/octoparts/util/KeyedResourcePool.scala
	project/Common.scala
	test/com/m3/octoparts/aggregator/handler/HttpPartRequestHandlerSpec.scala