Codesniff cleanup for countries model
Merge branch 'master' into cs_countries_model
Merge remote-tracking branch 'dstockto/cs_countries_model'