Merged fix for TRQ-1607 from the 4.1-dev branch - ALPS reservation incorrectly marked as orphaned.