Merge pull request #128 from MartyBurns/master

sync with Ron's version; modify DataCustodianScopeSelectionList URI in test data
Merge remote-tracking branch 'upstream/master'