Some minor fixes.
- RemoveFromMemoryPool - fixed handling of pending names when reorganizing the block chain
- version-dependent arguments in UPNP_AddPortMapping (miniupnpc 1.5 vs 1.6)