Conflicts: qa/workunits/cephtool/test.sh properly co-exist with "# make sure we can't create an ec pool tier" src/mon/OSDMonitor.cc properly co-exist with preceding "if (tp->ec_pool())" (The changes to both files would have applied cleanly ifhttps://github.com/ceph/ceph/pull/5389 had not been merged first.)