Incorporate further review comments
Incorporate further review comments

justinsb/kops,kubernetes/kops,robinpercy/kops,kubernetes/kops,kubernetes/kops,justinsb/kops,robinpercy/kops,robinpercy/kops,justinsb/kops,robinpercy/kops