Merge feature/Archving into develop branch

* Hand massaged mkall.targets

Change-Id: I49720b21c1efe1dcddf366387af422de38a5dc76