Preliminary node up (reintegration) changes.
Merge branch 'master' of https://github.com/fuentead/recovery

Conflicts:
	sqf/sql/scripts/sqgen
Node up (re-integration) fixes, code cleanup, etc.