removing thread-local cache for branch_setting
Merge pull request #75 into rc

from origin/jbau/stanford/remove-branch-setting-cache
Merge branch 'rc' into release
Merge branch 'release' into master