Sync changes from master
Sync changes from master

Specifically
https://github.com/kubernetes-incubator/kube-aws/commit/b9c94e1d1926d182
8193c4f50018fae3a46432ad

camilb/kube-aws,danielfm/kube-aws,iflix-letsplay/kube-aws,danielfm/kube-aws,HotelsDotCom/kube-aws,kubernetes-incubator/kube-aws,HotelsDotCom/kube-aws,iflix-letsplay/kube-aws,c-knowles/kube-aws,kubernetes-incubator/kube-aws,c-knowles/kube-aws,camilb/kube-aws