merging changes in gitpsi and gitmlz branch Change-Id: I4996da637ad62c5bd76596ea95aee1decaaccaf2
debian/ is still missing, will follow in next commit. Fixes: #4626 Change-Id: Ia87c28c1c75b8402eedbfca47f888585a7881f44