Merge "Teach watchman to ignore buck-out directory"