Whitespace and https cleanup for Bug 960689