Shift servermanagercmd_returns into a proper private variable...
Merge branch 'servermanagercmd_1003' into spotlight_merged