merges job controller conflict

Change-Id: Ieee490ce68cf0ba1b7aafb696c6c87021a6ec7cc