JCLOUDS-200: Consolidate all feature-specific in the AWS provider

Follow-up to b7d75f79