Fix 2.4 changes and add admin menu plug.
Core impact avoidness. 2.4 fixes
relocate files
strict fixes, debug cleanup
resolve merge