Update Potlatch 2 to r24252 build