Merge branch 'master' into ha (v0.12)

diff --cc debian/control
index 7cdfcc4,14aa8b5..fb41250
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -16,11 -16,12 +16,21 @@@ Description: Local Unified Index (Solr
   (subdatabases). The underlying index is a Solr/Lucene 5 index configured 
   to use a specific LUI schema.
  
+ Package: masterkey-lui-solr6
+ Architecture: all
+ Depends: openjdk-8-jdk, ${misc:Depends}
+ Conflicts: masterkey-lui-solr4-common, masterkey-lui-solr4-master, masterkey-lui-solr4-slave, masterkey-lui-solr4-zookeeper, masterkey-lui-solr4-common-tomcat6, masterkey-lui-solr4-master-tomcat6, masterkey-lui-solr4-slave-tomcat6, masterkey-lui-solr4-common-tomcat8, masterkey-lui-solr4-master-tomcat8, masterkey-lui-solr4-slave-tomcat8, masterkey-lui-solr5
+ Replaces: masterkey-lui-solr4-common, masterkey-lui-solr4-master, masterkey-lui-solr4-slave, masterkey-lui-solr4-zookeeper, masterkey-lui-solr4-common-tomcat6, masterkey-lui-solr4-master-tomcat6, masterkey-lui-solr4-slave-tomcat6, masterkey-lui-solr4-common-tomcat8, masterkey-lui-solr4-master-tomcat8, masterkey-lui-solr4-slave-tomcat8, masterkey-lui-solr5
+ Description: Local Unified Index (Solr)
+  The Local Unified Index is a index that contains multiple logical indexes 
+  (subdatabases). The underlying index is a Solr/Lucene 6 index configured 
+  to use a specific LUI schema.
++
 +Package: masterkey-lui-zookeeper
 +Architecture: all
 +Depends: openjdk-7-jdk, ${misc:Depends}
 +Description: Local Unified Index (Zookeeper)
 + The Local Unified Index is a index that contains multiple logical indexes 
 + (subdatabases). The underlying index is a Solr/Lucene 5 index configured 
 + to use a specific LUI schema. This package provides an installation
 + of Apache Zookeeper suitable for a lui-solr cluster.