bugfix for 2nd headnode not including itself
Merge branch 'headcount' into contrail