Merge "Using new Ubuntu 1c 1g for xos gui unit tests"