Bug #2093: Make messages to get a resource by _uid _id similar

(cherry picked from commit ae116531f80c1f5c8f4487039e95ee12c8ef9af9)
bug #2093: Parsers compiled with latest changes

(cherry picked from commit 8d02a71c3cb9ef6387e9e4a9e4efdcf43a91b126)