Update MergeBeanPostProcessor to fix issues with early and late stage initialization