Resolved merge conflict on gradle.properties file
Resolved merge conflict on gradle.properties file

marklogic/data-hub-in-a-box,marklogic/data-hub-in-a-box,marklogic/data-hub-in-a-box,marklogic/data-hub-in-a-box