decouple TextFieldWithBrowseButton logic from EnvironmentVariablesComponent
Fix plugin build.
Merge remote-tracking branch 'origin/master'