Added user and group name to archive file set and changed to Pattern version of Groovy regex syntax