added missing license terms
resolved confdb conflict