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

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