Merge proposals dependent on lp:~heber013/custom-grafana-integration/fix-parser-for-skipped-value

1. fix-parser-for-skipped-value
2. Dependent merge proposals