Sync wiith some of the mainline changes

Add and use FieldMap::getFieldIfSet interface, implement missing Message
constructor.