Merge pull request #2169 from ZappoMan/bugfixes

Menu scripting bug fixes
fix a flipped null check
Merge pull request #2173 from birarda/null-checks

fix a flipped NULL pointer check
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
more octree locking cleanup