from pull-request 1 * refs/heads/master: [NO-BTS] correct jsp tag library xsd file version and location. [#2] remove NetworkUtilsTest.testGetMachineName__getHostName() * If getHostName() fails because of UnknownHostException, call getMachineName()
* If getHostName() fails because of UnknownHostException, call getMachineName()