Bug 908673 - Removed popd from control script

* popd in some cases attempted to cd into directory user didn't have permissions for
Merge pull request #4 from jwhonce/dev/bz908673

Bug 908673 - Removed popd from control script