Merge pull request #1339 from RosettaCommons/kkappel/farna_protein_vdw+swa_revival fixing cppcheck test failure that I created in pull request #1332