Stashing change
Issue 1841: Added cucumber test
Merge branch 'master' into issue_1841
Merge branch 'master' into issue_1841
Merge pull request #889 from scottsds/issue_1841

Editing collection: error 500 if collection name is removed