small refactors on account manager#11784

DaanHoogland wants to merge 2 commits intoapache:mainapache/cloudstack:mainfrom

DaanHoogland:accountManagerRefactorsDaanHoogland/cloudstack:accountManagerRefactorsCopy head branch name to clipboard