Restored test_cmfd_jfnk/results_true.dat

This pull request restores the correct values for one of the tests which was overwritten in commit 9a13282d2da758681d10476522ec2802d9e48d1a. This pull request also updates the tally_trigger branch with the latest version of the openmc/develop branch. This should be everything that is required for the tally trigger PR to be fully merged into openmc.