Merge pull request #2364 from RosettaCommons/dimaio/ref15_compatability_fixes Dimaio/ref15 compatability fixes