Update Potlatch 2 to r25074 build