Merge into master from pull request #3363:

...va/net/floodlightcontroller/core/internal/Controller.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

...oodlightcontroller/notification/INotificationManager.java

...tcontroller/notification/INotificationManagerFactory.java

...htcontroller/notification/NotificationManagerFactory.java

...roller/notification/syslog/SyslogNotificationFactory.java

...roller/notification/syslog/SyslogNotificationManager.java

...ntroller/notification/MockNotificationManagerFactory.java

...t/floodlightcontroller/notification/NotificationTest.java