Fix duplicate check for ACL rules with cidr

While checking for duplicate ACL rules, we were ignoring the prefix part. As a result, if two rules containing different prefixes were being added, we were treating them duplicates and were not adding the second rule. Added comparison of prefixes while comparing rules.

Also updated the unit test case for the same.

Closes-Bug: 1392545
(cherry picked from commit 2f31043a6819058eb1a641ce7f391ca7ba2822de)

Change-Id: I1dc1669826e3f9154f2876074c0eada58b59ac29
Re-establish session with ifmap server on error during publish.

Looking at logs of ifmap server, it appeared that at
1. t0 - api-server connected to ifmap server and published config-root etc.
        using port# p1
2. t1 - ifmap server reported api-server authenticated to it using port #p2
        and it deleted existing session with api-server
3. >t1 - any api-server publish to ifmap server on port# p1 fails.

event on t1 is an unresolved mystery. However same situation is created by
1. neutron net-create n1
2. ifmap-view localhost 8443 api-server api-server
3. neutron net-create n2 fails

To fix, on receiving errorResult in publish, redo newSession and re-publish.
Log on edges of failure + success. Also don't try to publish when there is
no update or delete body as that will lead to ifmap error.

Add a unit test to simulate above

Change-Id: I2468c1d86e48f1e9264e57a10805239fcd835a98
Closes-Bug: #1392132
Merge "Re-establish session with ifmap server on error during publish." into R1.10
Fix the version info to 1.21

Change-Id: I35b365847922a4bfe0bdda4e4d20c025adf22601
Rename dns processes to have contrail- prepended.
change dnsd to contrail-dns, named to contrail-named,
rndc to contrail-rndc and rndc-confgen to contrail-rndc-confgen.

Change-Id: I57e0d1e7d164c7a5bcec3b8d2f87375a6f7b754b