Replacing node_template instance variables
Merge branch 'master' into aws
Merge branch 'aws' into aws-dynamo