* Make bolt timeout a config value * Merge refs/heads/master into best-practices0timeout * Merge refs/heads/master into best-practices0timeout * Merge refs/heads/master into best-practices0timeout