Merge branch 'trunk' into HADOOP-6350
add JournalNode metrics
added MetricsSystem and UgiMetrics
subtle fix