Shipment manifest tweaks

Improved shipment manifest query and isolated the manifest block on its own partial file. While running the specs I noticed some duplicated tests and removed them.

In case both commits are merged please do it in 2-0-stable as well.