Merge changes Icd3fe49f,Ib8157921,Ia80da27f into klp-dev

* changes:
  flounder: disable watchdogd
  flounder: More power configuration
  flounder: Minimal changes to boot 3.10