NPE when project contains package named 'global'

Description of problem:
Let's have a project with package com.business.global. After navigating to com.business package in Project Explorer error dialog pops up saying only java.lang.NullPointerException. Furthermore, data modeller fails to load. No error presented to the user, NPE in server log.

Version-Release number of selected component (if applicable):
6.0.1.ER2

How reproducible:
-

Steps to Reproduce:
1. Create 'global' subpackage in any project (e.g. under org.any.pkg).
2. Switch to some other package (e.g. org).
3. Switch back to the parent of 'global' (e.g. org.any.pkg).
4. Open Data modeler.

Actual results:
Error message after step 3. Data model not loaded in step 4.

Expected results:
'global' is a valid package name, it shouldn't break the project.

Additional info:
Probably caused by https://github.com/droolsjbpm/guvnor/commit/912986ab9ea2435b40841c1130d152555df1f8e2