Merge pull request #31 from jchambers-ln/master

reverted back this file HPCCServerInfo.java
eda changes
Merge remote-tracking branch 'upstream/master' into eda
Merge remote-tracking branch 'upstream/eda' into eda