Merge proposals dependent on lp://staging/~therp-nl/ocb-server/6.1_lp1260743_print_empty_lines

1. 6.1_lp1260743_print_empty_lines
2. Dependent merge proposals