Fix the NPE that caused TISTUD-5575.
Merge branch 'development' of https://github.com/aptana/studio3 into development

Conflicts:
	plugins/com.aptana.js.core/src/com/aptana/js/internal/core/node/NodePackageManager.java