Simplify by eliminating context: namespace

 - Drop down directly to PPC / PSPC bean definitions
 - Test failures are the same
 - Thus we can conclude the issue is not at the BeanDefinitionParser level
Rename resources for clarity; demonstrate override
Merge branch 'SPR-10344'