Merge "jjb: xci: Make use of alternative ssh configuration file"