Restore ability for profile suffix key to refer to other property

[jonathanaustin]

The property bordertech.config.profile and the deprecated property it is replacing bordertech.config.environment do not get substituted when they refer to another property, which is usually a system environment property.

## This substitution is not currently working
bordertech.config.profile=${MY_ENVIRONMENT}