Merge remote-tracking branch 'origin/mad-hatter'

|\
| * c78e343 Sreekanth Sivasankaran | MB-37095 - fts scatter gather fails on tls

Change-Id: I1e10096c57b45b30455772f0209a6ca29610daf3

cbauth.go

@@ -49,11 +49,8 @@ func GetSecuritySetting() *SecuritySetting {
 
 var securityCtx *SecurityContext
 
-func InitSecurityCtxAndRegisterWithCBAuth() {
-	securityCtx = &SecurityContext{
-		notifiers: make(map[string]ConfigRefreshNotifier),
-	}
-
+// RegisterSecurityNotifications registers for the cbauth's security callbacks
+func RegisterSecurityNotifications() {
 	cbauth.RegisterConfigRefreshCallback(securityCtx.refresh)
 }