Merge "Fix Yamllint Violations for jjb/bottlenecks"