fix
Directory Structure Change

This is to support Security Onion Integration
Merge branch 'dev'

Conflicts:
	opt/onionsalt/pillar/users/init.sls.orig