move alert-aws to contrib/experimental
Merge branch 'master' into feature/tags-as-dict
more succinct tags parsing