Update 3.3.0-rc7 with security fixes and more since rc6

Gerrit 3.3.0-rc7 includes the latest security fixes, mostly coming from
the merge of the 3.2.5(.1) release from the stable-3.2 branch.

Make some indentations consistent with these additions.

Change-Id: I9bfe3759bc47835c8b00c432b637d4bf6b3609a3
1 file changed