Features/123 standardise properties

Replace the properties in context.xml with properties in spring-context.xml.