More cautious use of the exclude_from_allocation attribute (OMS-389)