Update comments in key to be doxygen compatible
Update comments in keystore to be doxygen compatible
Merge pull request #5148

2b173d3 Update comments in keystore to be doxygen compatible (Michael Ford)
ffd8edd Update comments in key to be doxygen compatible (Michael Ford)