Display generation/heartbeat in gossipinfo

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7333
Merge branch 'cassandra-1.2' into cassandra-2.0