Removed the unused setting 'session.payload'.

Signed-off-by: Isern Palaus <ipalaus@ipalaus.es>
Merge pull request #1999 from ipalaus/fix/session-payload

Removed the unused setting 'session.payload'.
Clean up/clarify comments
Merge remote-tracking branch 'upstream/develop'