This creates a single place for all the work to happen, using the
presence of a session to determine if extra values need to be set.
Signed-off-by: NAnna Schumaker <Anna.Schumaker@Netapp.com>