Update Potlatch 2 to 2.1-21-g5f128f5 build