Bug 15184: Fix bad merge conflict with created_by