Fixed session race condition. Added headers to Merlin to make it clearer
what the steps do.

Change-Id: I823ed14672212af7898f0234e4d6649f7d8dd2fb