Bug 6151: Add AllowReturnToBranch system preference