Partial revert of r1645465 since StoreConfig is at the Server/JVM level so there is only ever one of them.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1645473 13f79535-47bb-0310-9956-ffa450edef68