#393 - Fix additional admin component scans and bean definitions
(cherry picked from commit 3fc5e74d519a77402c27c0bb4b12096d6509384f)