Fixes #5499: Rewrite initial promises to use normal ordering on 2.11
Refs #5446: Rewrite techniques to use only ${}
Merge pull request #486 from peckpeck/bug_5499/rewrite_initial_promises_to_use_normal_ordering_on_2_11

Fixes #5499: Rewrite initial promises to use normal ordering on 2.11
Merge branch 'branches/rudder/2.11'