cleanup; branch was merged to trunk a while ago
branch has been merged
FCREPO-790 fixed
FCREPO-819 fixed
FCREPO-784 fixed