fix validation regular expressions

The previous validations of times did not allow for specifying units of "h" or "ms", which are valid for puppetdb, but did allow for units of ",", which are not valid for puppetdb.  This fixes both problems.