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

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