jUnit
junit
Merge branch '1867_apache_CLI'

Conflicts:
	src/main/java/ru/taximaxim/dbreplicator2/CommonsCli.java