Merges the working create_links from a customer site to upstream
Merge pull request #326 from terwey/CS-4727

Merges the working create_links from a customer site to upstream