merge quilt return code checks from trunk to 8.09