Merge "Fix use of batch_create in CephMon major upgrade template"