Merge "xci: Set options in run-functest.sh"