Merge pull request #295 from qiangdavidliu/2.x

Server side registry changeNotifications require a Source identification
clean up
Fix up server configs