removed redundant value conditions from variables
Merge pull request #5654 from phil65/confluence_vars

[CONFLUENCE] removed redundant value conditions from variables