rfe #1572 User prefs: Diff-friendly JSON for config

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin