Merge pull request #1294 from Azure/andrew/bulkEditAssignmentScopes