Stop replacing X-Frame-Options header in FrameGuard

Fix for the change discussed in #1725
Add @throws fo dock block function signature