server: fix notify message handling bug

Change-Id: I6b15ef9973ac3430208a02990bea5dafc82a9d5e
fix bug for tls/ssl

Change-Id: I337ca8fe26ef011027692e0704a1c23d9787d4a0
Merge "server: fix notify message handling bug"
Merge "fix bug for tls/ssl"