Merge "create merge job for functest for master and stable/arno"