(into master) Bug 993904 - Use cached directory links instead of locally packaged links

https://bugzilla.mozilla.org/show_bug.cgi?id=993904