(PUP-798) Add call to watch_files to ensure reparsing

This adds a call to watch_file in the code path for the future
parser/evaluator at the same place such call is made in the 3x
implementation. 

The ParserFactory is given an environment, and when this is 
a real environment, its known_resource_types are given to the parser
adapter being created to allow it to make the call to watch_file.
Merge remote-tracking branch 'hlindberg/pup-798_watch-files-must-be-called' into maint/master/test-future-prs

* hlindberg/pup-798_watch-files-must-be-called:
  (PUP-798) Add call to watch_files to ensure reparsing
(PUP-798) E4ParserAdapter watches files through Environment

Instead of passing known_resource_types, if present, pass the given
environment, and provide a delegate method to watch_file on Environment.
Clears up a few layers of type checking and does not require the adapter
to know anything about known_resource_types for the purpose of watching
files, but a valid environment must be passed.
(maint) Uniform use of TypeCollectionHelper in Scope

Scope includes TypeCollectionHelper which provides an accessor for
known_resource_types.  This patch just fixes a direct reference to
environment.known_resource_types to instead use the delegate method the
same as other known_resource_types calls in the Scope class.
Merge pull request #2190 from jpartlow/issue/master/pup-798-watched-files

Issue/master/pup 798 watched files