Fix #795: Return both cached and collected metrics
Fix #795: Return both cached and collected metrics

intelsdi-x/snap,sandlbn/snap,mjbrender/snap,intelsdi-x/snap,sandlbn/snap,mkleina/snap,mjbrender/snap,mkleina/snap