am eb217fc4: merge in klp-release (no-op)

* commit 'eb217fc40c6fe952933cdc2a37875a5a49444491':
  Always check against canonical paths.