Merge "Make ForkController destroy redis instances too"