Implementation: * Updated to substitute macros in endpoint for all disks (s3, hfs, web). Testing: * Added an integration test test/integration/test_endpoint_macro_substitution.