-BZ-1171810: partial fix, deployment id check