Rename to use hadoop.htrace when needed

Signed-off-by: Colin Patrick McCabe <cmccabe@cloudera.com>