Fixes #5498: Rewrite initial promises to use normal ordering on 2.10
Refs #5446: Rewrite techniques to use only ${}
Merge pull request #485 from peckpeck/bug_5498/rewrite_initial_promises_to_use_normal_ordering_on_2_10

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