Updated files to push more info to splunk
Merge master, fix merge conflicts