Add tag support to AWS subnets
Merge branch 'master' of https://github.com/serenitus/terraform into serenitus-master
provider/aws: Fixing merge conflict