MERGE: branch updated with trunk changes through r50560
Branch for migration to Saxon HE
Fixed collector plugin
Added modular collector service