Refactored so servername is fully formed in pushmgr intead of api