Update Potlatch 2 to r25217 build