changed functional test for contact count (CORE-1828) into an integration test
Merge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x