Merge "Fix Yamllint Violations for jjb/container4nfv"