TRUNK-3738 Fixed stopping module

(cherry picked from commit 67c9f035ff34a90e00c014dfbcb8cb4d209690e9)
TRUNK-4049 Daemon cannot assing System Developer role

(cherry picked from commit e8dca618e273cd125f0005fbcf76f48b646433c9)