Updates based on fcrepo modifications

Related to: https://www.pivotaltracker.com/story/show/78960386