upgrade consumer metric-zapp and include control plane in default config
Merge pull request #59 from zenoss/feature/fix_metric_data

Feature/fix metric data
fixed undefined timezone value, minor formatting changes, updated nvd3 and d3 library
Merge pull request #60 from zenoss/feature/timeoutFix

Feature/timeout fix
merge with develop