Used a different hook to prevent Link headers from being generated
twice. Rewrote test for Link header insertion.

Change-Id: I554dd4873bcc15268aa72f6f99fda76737f65850