[MERGE] fix sync metadata return code and clarify some comments

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>