The update to 2.31.6 in the 2015Q3 branch wasn't complete. There
where other changes between the 2.31.2 and 2.31.6 which where missed.

So to fix this, remove two patches that are now included in 2.31.6,
and update the plist for this version.

Submitted by: pkg-fallout
Approved by: portmgr@ (antoine@)