Fix for "--tags=": already defined in puppet" / bug #15165

Fix for "Error: Could not autoload puppet/face/node_aws/bootstrap: "--tags=": already defined in puppet"

By renaming the offending options. See Puppetlabs bug #15165: http://projects.puppetlabs.com/issues/15165