Add missing const qualifiers
Merge pull request #5712 from wmtan/AddMissingConstQualifiers

Trivial: Add missing const qualifiers