Merge pull request #2915 from markscott-ms/fix/stale-workshop-architecture-refs