Updated class def removal test to use new scope tester.
Merge remote-tracking branch 'remotes/origin/topic-data-incrementalupdate' into topic-data-incrementalupdate
Added overloads of AddFile in child classes. Updated merge methods to check for null.
Merge remote-tracking branch 'remotes/origin/topic-data-incrementalupdate' into topic-data-incrementalupdate