Remove netbeans /nbproject dir.
Migrate cleanup fixes from 7.x branch.