Merge pull request #2456 from RosettaCommons/everyday847/fix_branch_conn Fix farfar_mrna by fixing branch connection energies