ZP-1284 Fix multiple variable issues with Changessink code.  Released under the Affero GNU General Public License (AGPL) version 3.