merge bug25395 into bug25394
merge bug25409 into bug25394
eager sync of messages pending ack
populate slave's msg_id_ack with sync'ed messages pending ack
merge bug25394 into default