Addresses issues from fcrepo4 impacts

Resolves: https://www.pivotaltracker.com/story/show/82355180