Merge "Add documentation in akka.conf on how to specify location of persistent data"