Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'

QA: Only clear the sessions if there's no error with a block

Closes gitlab-qa#197

See merge request gitlab-org/gitlab-ce!19751