nodemanager robust skolem numbering
cleanup
Merge remote-tracking branch 'upstream/master' into sets