Fix log4plus properties file and move all merged properties there