Merge changes from topic "wd-flags" into qt-dev

* changes:
  Update PackageWatchdogTest
  Make PackageWatchdog variables configurable