Merge "Update log4cxx Windows project for renamed dep paths." into jumper