revised to test configuration
Merge remote-tracking branch 'upstream/master'
sync with Ron's version
Merge remote-tracking branch 'upstream/master'
Merge pull request #128 from MartyBurns/master

sync with Ron's version; modify DataCustodianScopeSelectionList URI in test data