Merge "Fix Yamllint Violations for jjb/onosfw"