Patch 2.5.1

Candidates:


Note about the deck service: current master includes only the SWIK-1756 and SWIK-1749 fixes, plus some integration tests and minor dormant bugs (i.e. discovered during test writing). So for simplicity reasons, master as is now could be simply merged with release branch and be done with it.