When you fix CMS-4082, you have removed the setCurrentStepId call, but you have not removed the addLockToken call. Then this block is useless:
try { Node node = content.getNode(); if (node.isLocked()) { LockManager lockManager = node.getSession().getWorkspace().getLockManager(); Lock lock = lockManager.getLock(node.getPath()); Node lockHolder = lock.getNode(); lockManager.addLockToken(lockHolder.getProperty(RepositoryConstants.METADATA_LOCKTOKEN).getString()); } } catch (RepositoryException e) { throw new WorkflowException("Unable to set metadata 'currentStepId' on content " + content.getId(), e); }