Refactor metrics and sync with current Indy for features.#48

jdcasey wants to merge 2 commits intoCommonjava:masterCommonjava/propulsor:masterfrom

jdcasey:masterjdcasey/propulsor:masterCopy head branch name to clipboard