HABmin: Updated build properties to include xstream
Resync branches