am 6be9c1c7: am a47c5ea4: Merge "Read enabled flag from XML if it is suppled; default is true" into klp-ub-dev

* commit '6be9c1c7872db2541a964f9c23744680ce5e70fa':
  Read enabled flag from XML if it is suppled; default is true