Merge branch 'martinal/topic-rename-domain_id-and-domain_data-and-domain_type'
Some fixes for 64-bit PETSc.
Merge branch 'garth/fixes-for-petsc-64' into next