(#15165) Fix error --tags already defined in puppet

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