Do not delete ql2.pb.cc

Review 788 by @srh
Closes #1230
Merge branch 'next' into sam_1233
Merge branch 'sam_1233' into next