Added LOGSTASH_USER override in sysconfig
Merge remote-tracking branch 'remotes/bflad/master'

Conflicts:
	SPECS/logstash.spec