Merge "functest: Move verify back to opnfv-build-ubuntu"