update %%canoncial_mysql_path%% to %%canoncial_mysql_path%%/
Remove / for canoncial_mysql_path
Merge remote branch 'cvs/master'