Replace deprecated Notification contructing with builder mechanism.
Fix "can't bind to port" exception when server tries to restart

Merging kwd commit 34145b48a21744d9ca09df3d7ced7359381ac913
Change-Id: I6392e58c70286105b10a54a457ee99ff06d49817
3 files changed