Resolve conflicts.   * Note that option hostname is only honored if the hostname is not     already set. (r1.2)
Resolve conflicts.
  * Note that option hostname is only honored if the hostname is not
    already set. (r1.2)

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase