correct path for configuration file (raspbian jessie 4.4.21-v7+) is
/usr/share/X11/xorg.conf.d/ and there is file "99-fbturbo.conf" so you need to make "98-calibration.conf" instead "99-calibration.conf" then all works (RPI3)!
and thanks for this great tutorial!! 1+