Resolving merge conflicts in pull request #13
Merge branch 'evertrue-evertrue/eherot/do_not_store_aws_keys_in_node_attributes'