Merge "Add missing parameters for kubelet/default.master"