GenericAgent interface clean ups, move some expansion logic to expand.h

PolicyHashVariables, BundleHashVariables are now PolicyResolve, BundleResolve
to prevent name collision with actual hash functions.

HashControls has been rolled into PolicyResolve.