Merge remote-tracking branch 'openntf/master' into work

Conflicts:
	jaggr-core/src/main/java/com/ibm/jaggr/core/impl/layer/LayerBuilder.java
	jaggr-core/src/main/java/com/ibm/jaggr/core/impl/layer/ModuleList.java
	jaggr-core/src/main/java/com/ibm/jaggr/core/util/DependencyList.java