Update Potlatch 2 to 2.3-584-g996bb4d build