Changed save directory in Data Store to use CATALINA HOME environment variable