Merge pull request #7452 from shykes/7370-on-7427

Cleanup: move image management and logging out of deprecated Server