Fix wa_results_collector + wltests notebook, get last master changes
Created by: valschneider
I had a geekbench wltests folder somewhere, so I used that to test the collector & notebook.
While at it, carry over the last few fixes that went into master that we didn't get in next.