Merge "Persist service references as separate MBeans."