Add manifest merging support#3994

jedevc wants to merge 2 commits intodocker:masterdocker/cli:masterfrom

jedevc:manifest-mergingjedevc/cli:manifest-mergingCopy head branch name to clipboard