Support alternative env bin directory name.
Merge pull request #1746 from arlsr/fixenvbin

Fix #1740, support alternative env bin directory name