Use Network.getProperty everywhere instead of System.getProperty
http://github.com/hyperic/jcollectd/issues/#issue/1
resolved conflict cherry picking d83d66a29e91043f5cb5bcce300973831f237400