Merge "Fix Yamllint Violations for jjb/models"