BZ-1090386: fix on ammended commits in order to preserve user/sessionId across commits