Merge "(bug 19195) Make user IDs more readily available with the API"

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

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

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

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

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