Merge "Fix calico definitions for k8s master."