remove machine reference as buildbot will provide it now
merge dylan-next to get local.conf setting changes