Merge last ITER changes on 3.3.x

resolves #531 #532
 - #531: Alarm Client Model initialized twice when alarm-notifier started
 - #532: Secure Preferences management improvement