Update Potlatch 2 to r24558 build