Merge in fixes from trunk (r8466-8473) for FCREPO-623 FCREPO-618 FCREPO-617 FCREPO-616 FCREPO-451
Authored by: birkland 2010-01-18
Parent: [r8487]
Child: [r8489]