Merge "Refactor pkgs for contrail-database and fix kitchen tests"