Merged r10501 from trunk
set user preference diff type nil at functional tests.
Authored by: tmaruyama 2012-09-28
Parent: [r10503]
Child: [r10505]