Merge asterisk into asterisk-bundle

https://trello.com/c/WiEOLtLq

Change-Id: I4b73446661503fade5b1223f2b462530cfb1bf37