Query hydrate: update_original_relation only for relations concerned

This is a reopen of PR #305, closed when the branch 1.7/develop has been deleted.

This PR not solves the #293 issue, but it prevents cases when problem does not arise (relation have not be fetched).