Merge "new conf file using old kubespray version"