cope with INADDR_ANY (should be config)
fold in changes from virtual machine
pass correct type of data through
allow configurable minimal orgs
allow limits on what packages are used in setup
add missing comma
Merge commit 'be2a' into integrate-phase2