Merge "jjb: xci: Only set default scenario if no scenario is set"