Fix mysql tests
Update gitignore
Merge remote-tracking branch 'mirantis/develop' into mysql-tests

Conflicts:
	.gitignore
Merge pull request #396 from dmitryilyin/mysql-tests

Fix mysql tests