contrail-version output for contrail-vrouter is not properly formatted. The current output is

root@a3s6:~# contrail-version
Package                                Version                 Build-ID | Repo | Package Name
-------------------------------------- ----------------------- ----------------------------------
:
:
contrail-vrouter                       1.1main.2067-3.8.0-29-generic1.1main.2067-3.8.0-29-generic
:
:

Fix the width for display of version and build-id, so that we get the following output (This is required for correctly
exporting version information for vrouter in UVE)

Package                                Version                       Build-ID | Repo | Package Name
-------------------------------------- ----------------------------- ----------------------------------
:
:
contrail-vrouter                       1.1main.2067-3.8.0-29-generic 1.1main.2067-3.8.0-29-generic
:
:
Ignore flows marked for delete while processing flows for aging and export of stats. Add test case for the same.
Remove commit d937eb2f21760801b6831ccd2258435a7c643698 from ashoksr_bugs branch
Merge pull request #442 from Juniper/ashoksr_bugs

Ignore flows marked for delete while processing flows for aging and stats export