Fix for plugin manager
Merge remote-tracking branch 'upstream/master'
WEBCMS-113 - Factorys and Factory tests complete for RCM