Remove patches and update to upstream patch release 0.12.1

python-unittest2 components are currently disabled, but they can be turned on by flipping the bit in the top define.