Make sure the new snapshot system works as intended in Jessie

“New snapshot system” = #6094 (closed). So this is mainly about reviewing the conflict resolution in commit b7b2a9a.

Feature Branch: feature/jessie

Original created by @anonym on 10402 (Redmine)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information