Peacock-2 branch update (refs #3920)