This commit: 1. Moves all changes to the proper place: lib/bash/collect.sh 2. Refactors pt-stalk so it is more modular 3. Places fix for PT-1734 into the right place: lib/bash/collect.sh 4. Fixes tests for PT-1336