Merge remote-tracking branch 'origin/master' into boot-configuration-support

Conflicts:
	spring-cloud-aws-core/src/test/java/org/springframework/cloud/aws/core/credentials/CredentialsProviderFactoryBeanTest.java
Merge remote-tracking branch 'origin/feature/boot-configuration-support' into boot-configuration-support

Conflicts:
	spring-cloud-aws-core/src/test/java/org/springframework/cloud/aws/core/credentials/CredentialsProviderFactoryBeanTest.java
Add @ElastiCache annotation, further auto-config polish