Merge "Include NewRollbacks in result of getAvailableRollbacks."