Merge "Bug 535730 - Add postfix 'hprof' to Virgo heap dumps"