Error in merge. Fixed.
Error in merge. Fixed.

splunk/splunk-sdk-java,dkelmer/splunk-sdk-java,splunk/splunk-sdk-java,splunk/splunk-sdk-java,dkelmer/splunk-sdk-java,dkelmer/splunk-sdk-java,splunk/splunk-sdk-java,dkelmer/splunk-sdk-java,splunk/splunk-sdk-java,splunk/splunk-sdk-java,dkelmer/splunk-sdk-java