*8902* Fixed auto staging for environments that return false when globing empty folders
*8895* Further changes from review.