Fix race in path to update

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>
Reword changelog

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>
Merge branch '3.9-maintenance'