Merge pull request #487 from jay-hodgson/release-7

SWC-754: update based on new submission acl access types
backing out SWC-715 to fix submissions