remove duplicateds log4j.proerty and fix load of it.
remove unused log4j.properties
Move version 2.1.0 to the trunk