UI > Edit Template, Edit ISO > can't update template/ISO in only one zone. It always get updated in all zones.
Update logo
Move LockMasterListener initialization to earlier in the code

This is not perfect fix but should address 99% of the issues.  The only
time an issue could happen is if something in the bootstrap or system
context tried to lock a row.  Which shouldn't happen at the moment.  If
we find that to be an issue, the LockMasterListener could move to system
context and be inject here.