#239 - Move CMS component scan out of servlet appctx and into a the root merged context