123 - PV - Standardise properties

Replace the properties in context.xml with properties in
spring-context.xml.
123 - PV - Standardise properties

Revise as comments.
Merge remote-tracking branch 'robworth/develop'

Merge remote-tracking branch 'robworth/develop' into
features/123-Standardise-Properties
Merge remote-tracking branch 'robworth/develop'

Merge remote-tracking branch 'robworth/develop' into
features/123-Standardise-Properties
Merge pull request #41 from lu-yang/features/123-Standardise-Properties

Features/123 standardise properties