Rename makeContainerKey -> make BoundPodsKey.

Fix some typos too.
Merge pull request #2525 from erictune/cleanup1

Rename makeContainerKey -> make BoundPodsKey.