BZ-99999 Fix Drupal resource names (changed during dev/testing)
BZ-99999 Save rootscope for LogFilter.
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap.git

Conflicts:
	src/main/js/bootstrap.deps.js
	src/main/js/noesis/bootstrap/Entry.js