Merge pull request #2943 from RosettaCommons/sboyken/fix_rna_intra_issue_in_numhbondcalc fixing NumberHbondsCalculator for DNA and RNA