Fixed minor null pointer error in AvailabilityMetric when availability > 100%
Fixed null pointer in AvailabilityMetric for availability > 100% print msg.
Merge branch 'master' into develop
Replaced java.util.logging with org.apache.log4j in ALL classes.
Because of this, all the cfg:log stuff could be moved out of config.xml
and into (a much more streamlined) log4j.properties.