Fix functional jobs
Fix functional jobs

Reenable the functional jobs, they used a non-existing job name due to a
wrong conflict resolution. The openstack-functional jobs are the right
jobs for this purpose.

Change-Id: I7d0fbe498e81e32fbd65c43029ae366520a330eb
Co-Authored-By: Michael Johnson <21c767074b8cc2972a46761d7673c9af2575bbd2@gmail.com>

openstack/octavia,openstack/octavia,openstack/octavia