am e76d9e6b: Fix erroneous comment in secdiscard.cpp, plus style fixes.

* commit 'e76d9e6be65c9af52a0ed722267521256269cc18':
  Fix erroneous comment in secdiscard.cpp, plus style fixes.