Fix up bean definitions for bundle hot-swapping.