Merge "Fix Yamllint violation for jjb/doctor"