Added keep_containers flag. Also UIDs are not released from the pool if keep_code_folders is true