Additional fixes to support both Contrail 1.06 and 1.20

This commit adds additional fixes to properly support Contrail 1.20 and
allow a co-existance of support for 1.06 and 1.20, namely:

* All modules test the contrail version by checking the hiera::contrail
variable now.

* For the contrail-vrouter-agent, use a different upstart job on 1.20
(the name of the binary has changed)
Fix typo