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