Merge pull request #38 from ssamartyn/develop

Fixed ZEN-11585
Fixed ZEN-11838 - Monitoring Exchange 2007 SMTP graphs results in nan value
Merge remote branch 'upstream/develop' into develop