Updates to device management for zone and site updates. Updated
persistence calls to handle inserts and updates in a common piece of
code.