Merge pull request #1350 from RosettaCommons/tlinsky/tlinsky/hb_cst_gen_update Minor constraint generator updates