Replace @ConditionalOnExpression

This commit replaces @ConditionalOnExpression instances that are
checking for a specific value to @ConditionalOnPropertyValue