Merge "Change the optf has and osdf jjb jobs to use ubuntu1804 node"