Merge pull request #2810 from RosettaCommons/sergey/binder updating build script, making machine-name calculation more stable