abstract contrail version number and do pinning in puppet module, fix some deps