Merge "Remove deprecated ApiAction logging code from ApiMain.php"