overlay: Override  backKillTimeout
Merge remote-tracking branch 'kf/jb-mr1' into jb-mr1
overlay: Cleanup
overlay: Move to common config
Merge remote-tracking branch 'kf/jb-mr1' into jb-mr1
Merge remote-tracking branch 'kf/jb-mr1' into jb-mr1
Merge remote-tracking branch 'origin/jb-mr1' into cm-10.1