Resolve divergence from Jetpack - Big Whitespace Fix.

Also some minor code style things, adding braces, etc.  But mostly
converting line indentations from spaces to tabs, most of which have
crept in via pull requests.
https://github.com/Automattic/jetpack/commit/e4c9584e67f1cb4027590600624e67a6371ce85f

Merges r106400-wpcom.
Resolve divergence from Jetpack - Big Whitespace Fix.

Also some minor code style things, adding braces, etc.  But mostly
converting line indentations from spaces to tabs, most of which have
crept in via pull requests.
https://github.com/Automattic/jetpack/commit/e4c9584e67f1cb4027590600624e67a6371ce85f

Merges r106400-wpcom.
Merge commit '89ac169'
Minor styles change when merging .com code
Conflicts:
	modules/widget-visibility/widget-conditions.php
Scribd Shortcode: Apparently they support HTTPS now for their embeds, so let's use protocol-agnostic links to go either way. See https://[private link]

Merges r106443-wpcom.
Scribd Embeds: HTTPS Support
Since Scribd is a core-provided oembed provider, and we're now processing oembed in comments as well, that's kicking in to handle one-line embeds in that context. This filter overrides the oembed endpoint provided by core so that it hits the HTTPS endpoint, and thus gets back HTTPS embed data. See https://[private link]

Merges r106445-wpcom.
Widget Conditions: File formating