Issue/master/pup 876 redhat 6 upstart

This adds a new confine type 'any' to allow logical ORing of conditions, and uses that to enable upstart on Redhat 6 systems.