Improve ensuring that ha:enabled attribute is always reported.

Change-Id: I9f99e1615ee69b922dc5144a9cd6b5c9c8f23fda