Restore "(HI-304) Make order override work with interpolation"

Reverts puppetlabs/hiera#222 to re-apply fix to Hiera. #222 was to address failures in Puppet's acceptance tests due to the change.

Some discussion is needed to ensure this change can be made, and fixes applied to puppet, without introducing breaking changes.