Merge "Fix Yamllint Violations for jjb/ovsnfv"