Bug 956899 - Use "||" as a preprocessor operator rather than the non-standard "or".  r=jwalden

--HG--
extra : rebase_source : da6a96d1acf2c97ff3d687d24a61695a0d12e709
Bug 956899 - Fix compilation failure when JS_GC_ZEAL isn't defined.  r=terrence

--HG--
extra : rebase_source : 9289522c0c7d974ed5d08fce496a1a2c48dcfb39
Bug 956899 - Remove unused stack-base-address tracking code from the JS shell.  r=jwalden

--HG--
extra : rebase_source : bfff6e4eb041241a108b43d5e1530b7232614c66
Bug 956899 - Use mozilla::ThreadLocal instead of NSPR for ForkJoinSlice's thread-local variable, and use it in all cases, not just threadsafe, for simplicity.  Also do some slight style-fix renaming.  r=jwalden

--HG--
extra : rebase_source : 577b0ffc6c8136d722b7d39fd566a07c6ead2f18
Bug 938092 - Building with gcc4.5 fails if both --enable-webrtc and --enable-tests.  r=tterribe