small changes after parser validation and lint
Merge branch 'vhost_directory' into all_features