Merge "API: Handle "special" options in action=options"

diff --cc includes/Preferences.php
Simple merge

diff --cc includes/User.php
Simple merge

diff --cc includes/api/ApiOptions.php
Simple merge

diff --cc tests/phpunit/includes/api/ApiOptionsTest.php
Simple merge