Merge "Add proper location for karaf.log"