Merge remote-tracking branch 'origin/master' into test
Updating for testing logstash parse
linked container hostname
linked container hostname
updated documentation
Merge branch 'test'