Added ubuntu repo for cloudstack 4.2
Fixed automerge conflict