Create v2 of API, put behind waffle switch (bug 937246)

r?