Cleanup in vars.conf.
Updated some scripts and schemas.
Aeed data dir setteings
Merge branch 'test' into dev