Code review markups.  Make more code common in datamodel_v1.py.
Code review markups.  Make more code common in datamodel_v1.py.

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