Update Potlatch 2 to r24796 build