OF-800: Fix handling for system properties page

Properly detect and modify encryption settings from the system
properties page. Remove encryption settings for deleted properties.