synch with upstream 360763d8

Synchronized up to:
https://github.com/mcu-tools/mcuboot/commit/360763d80b1c255aba4871d49cd19c2a84098165



- fixed corupted build when the image encryption feature is enabled.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>