TEZ-1666. UserPayload should be null if the payload is not specified.
(sseth)
(cherry picked from commit 4e69bed5c7dbc68d17f3d4648838e5acfc52c3eb)