null_inst* : style corrections.
null_inst_tests : sort includes.
Merge branch 'develop' into google_style