Bring over change [3125] from Pastry SVN, which includes an updated freepastry.params file with Jeff's recommendations for the new CJP parameters.
