MB-9119. Query packages will unzip in a subdirectory