Fix duplicate package definitions in toollabs

Change-Id: I47b0d753f38e2f24af7db4b378b188907863d926
Inserted some more packages to development set

Change-Id: I9fec629ffb131852f539be8c510734f3b5c38653
Merge "Inserted some more packages to development set" into production