ManagementService register/unregister fixes #683
Merge pull request #705 from gurbuzali/fix/3.0/issue-683

ManagementService register/unregister fixes #683