Fixes #5497: Rewrite initial promises to use normal ordering on 2.6
Refs #5446: Rewrite techniques to use only ${}
Merge pull request #484 from peckpeck/bug_5497/rewrite_initial_promises_to_use_normal_ordering_on_2_6

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