Resolve conflicts and finalize server_manager refactor#133

Cylae merged 2 commits intoserver-setup-scriptCylae/server_script:server-setup-scriptfrom

rename-to-server-manager-11612129014413565529Cylae/server_script:rename-to-server-manager-11612129014413565529Copy head branch name to clipboard