Merge "Special version for alarm manager" into alarm_wa

diff --combined pkg/xapp/xapp.go
index e832436,151b14b..a38efbc
--- 1/pkg/xapp/xapp.go
--- 2/pkg/xapp/xapp.go
+++ b/pkg/xapp/xapp.go
@@@ -37,7 -37,6 +37,7 @@@ import 
  )
  
  // For testing purpose go version 1.13 ->
 +
  var _ = func() bool {
        testing.Init()
        return true
@@@ -57,7 -56,7 +57,7 @@@ var 
        Logger        *Log
        Config        Configurator
        Subscription  *Subscriber
-       Alarm         *AlarmClient
+       //Alarm         *AlarmClient
        Util          *Utils
        readyCb       ReadyCB
        readyCbParams interface{}
@@@ -76,7 -75,7 +76,7 @@@ func SetReadyCB(cb ReadyCB, params inte
  }
  
  func XappReadyCb(params interface{}) {
-       Alarm = NewAlarmClient(viper.GetString("moId"), viper.GetString("name"))
+       //Alarm = NewAlarmClient(viper.GetString("moId"), viper.GetString("name"))
        if readyCb != nil {
                readyCb(readyCbParams)
        }