Control better which sideconditions get shelved

Merged Michael Sammler requested to merge time/shelve_sideconds into master

Merge request reports