Test: split conceptually unrelated comments in RDB test.
Sentinel: turn old master into a slave when it comes back.
Merge remote-tracking branch 'antirez/2.6' into 2.6