Fix neutron packaging in master

To avoid breaking compatibility with havana we package new files
conditionally on current version. Thanks pbr for different versions
for each commit.

Change-Id: I7b908e768cf85cfe51a7c23bf446b7c2346c373d
Merge "Fix neutron packaging in master"