Add API v2 URLs (bug 937246)
DON'T MERGE
WIP