More robust manifest finding

MSP-10825
Releasing