Rearrange session arguments

Way back on https://review.openstack.org/#/c/88485 I said I
would rearrange the arguments to the session.  Here is is.

Change-Id: I477f10f56e0366b01923d0df46d60247a86ac47c