Fixes #5987: Remove $() notation which is not in our best practices
Merge pull request #612 from ncharles/bug_5987/dev/correct_test

Fixes #5987: Remove $() notation which is not in our best practices
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0