Updating to cdh4.3.1, upping snapshot version to wmf-2

Change-Id: Ifdffb500b3251d94f094ab667a9ce3296291577b