(PUP-2682) Allow trailing comma after node matches

This adds the ability to have a trailing comma after the last
match in a node expression.
Merge branch 'pr/2699'

* pr/2699:
  (PUP-2682) Allow trailing comma after node matches
Merge branch 'master' of https://github.com/puppetlabs/puppet