Merge changes from topic "fail-validation"

* changes:
  Delete orphaned staging directories for staged session on reboot
  Clean up staged session data on validation failure