Improved CdbException handling in Interwiki

Change-Id: I6461b64dc77b3ecc641db39da1e9be306100fda3
Merge "Improved CdbException handling in Interwiki"