Update for cppTango 9.5.x

A couple of modifications are needed to make alarm-handler compile against cppTango 9.5.x.