remove old tool; have generator reactor properly if already done
Merge remote-tracking branch 'upstream/develop' into pcisig-develop