Merge pull request #586 from apache/cleanup-aws

Camel-AWS extensions: Cleanup