Fix preserving local-only flags during Item merging

Authored by dvratil on Jun 24 2016, 1:51 PM.