Merge remote-tracking branch 'upstream/master'

Conflicts:
	jaggr-service/src/test/java/com/ibm/jaggr/service/impl/layer/LayerTest.java