Merge "Updated error codes for Doclava migration"