Redmine#4889: more tests for unresolved variables
Use full ExpandPromise for variables in BundleResolve

Does full evaluation of variables in BundleResolve, as opposed to
the previous more lightweight method.

Close #4889
Do not PolicyResolve on every merge in loading

No longer necessary due to heavier BundleResolve