Preserve keys in object's system area

Sub-keys in object's system area ('?') are no longer
deleted after deployment

Change-Id: Ieae7a472fa25df56d19fad6b1d604122ebd98aa5
Closes-Bug: #1308923
Merge "Preserve keys in object's system area"