Merged Darix's changes in build done in BS only!

This PR contains:
1. https://build.suse.de/request/show/41705 (rejected because Darix did changes in IBS only)
2. https://github.com/yast/yast-storage/pull/97/files (using new ruby macros only when available)