LPS-49321 SF
LPS-49330 - Apply latest patching tool to test bundles
LPS-49330 sort by the property we're trying to build