Merge branch 'package-management'

Conflicts:
src/preferences/network/Jamfile

Add some missing build headers