Change in vdsm[master]: check-merged: split functions by logic and few nits