Merge pull request #1861 from midopa/master

Clear the sessionOverride when cleaning up session
Add app wait package
Merge pull request #1869 from imurchie/isaac-packageselect

Add app wait package
reshuffling tests