Xaviers fix for CRM-14506
Merge pull request #3186 from totten/4.4-rest-q

CRM-14506 - REST - Prefer "entity"/"action" over "q" (via xavier and enders)