Attempting to fix the failing build on php 5.3 and 5.4
Refs #3490 Add `getUserId` Javascript helper + test
refs #4996 removed V2 part of doc as created issues for them
Fix build - how did I not think of this solution earlier...
Merge remote-tracking branch 'upstream/master'