Spring properties AND a properties file