small fixes
merged with master
fixes for latest defects
Merge pull request #525 from nla/bulkEdit-dsc-379

Bulk edit dsc 379