Initial testing passing
Merge branch 'devel' of 10.0.1.3:product-setup into devel

Conflicts:
	product-setup.bash
	setup-product.bash