[bundle] Use unmerged Nap branch.
[GitHub] Cleanup list of timeout errors to use the Nap wrapper.