Fix harmless NPE in MM/HHOM
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-5185
Merge branch 'cassandra-1.2' into cassandra-2.0