Merge changes from topic "wd-flags-master"

* changes:
  Update PackageWatchdogTest
  Make PackageWatchdog variables configurable