Use better merging algorithm.

Remove defaults from licenses. First value is now default

Change-Id: Ib8d3b6633ad564d7cd547940d5763e4a9e0008dd
Fix missed rename of filterTemplate

Change-Id: Icd0063a3b6acc3b7f986b5a90f95388b0a722407
Remove unused 'default' config variables

Change-Id: I8fad95c56ef38573b5a7ca5984a9b0b387c14e1c