Various code review markups ready for merging.
Various code review markups ready for merging.

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