Merge "Fix Yamllint Violations for jjb/kvmfornfv"