Merge "Fix Yamllint Violations for jjb/nfvbench"