Moved open-admin dependent beans into the correct application context definitions and moved some of them to use component scans. Also enhanced the merge processing to support in-line list definitions rather than target a bean ref for merging which should resolve #83