Fixed up rebase errors and changed What to Why
Fixed up rebase errors and changed What to Why

kasisnu/calico,TrimBiggs/calico,neiljerram/felix,TrimBiggs/calico,neiljerram/felix,beddari/calico,matthewdupre/felix,kasisnu/calico,beddari/calico,alexhersh/calico,matthewdupre/felix,Metaswitch/calico,neiljerram/felix,ocadotechnology/calico,alexhersh/calico,ocadotechnology/calico,anortef/calico,Metaswitch/calico,nbartos/calico,anortef/calico,neiljerram/felix,nbartos/calico