fix collecting PIPs from crowbar.yaml and PFS sources
Merge branch 'bug/DCB-164/havana/master' into bug/DCB-165/pebbles/master

Conflicts:
	build/build.rb

Solving conflict, before merging