Update Potlatch 2 to 2.4-21-g233799c build