Update Potlatch 2 to r24694 build