Merge "Bug 1894: Add LISP configuration options to etc/custom.properties in Karaf"