Logstash shipper changes
Merge remote-tracking branch 'ta/master'

Conflicts:
	.project