Changes EC2 detection to a (hopefully) less disruptive way.
Updates to latest ice4j and improves EC2 detection (hopefully)