Merge pull request #2033 from sipa/kickconflicts
Bugfix: remove conflicting transactions from memory pool