(PUP-2253) Change catalog reource ordering to be "manifest" by default