Fixing typos
Merge pull request #421 from danmcp/master

Merged by openshift-bot
bump(github.com/GoogleCloudPlatform/kubernetes): 97cb1fa2df8b57be5ceaae290e02872f291b7b7e
Kube rebase (1/3)
Kube rebase (2/3)
Kube rebase (3/3)
Merge pull request #441 from smarterclayton/mergefive

Merged by openshift-bot
Fix error message in generic webhook