modified:   ts/5.2/conf/default/build.conf.example
	modified:   ts/5.2/build.conf.example
Merge branch 'master' into 5.2-Stable
	modified:   conf/default/build.conf.example
	modified:   ts/5.2/build.conf.example
Merge branch 'master' into 5.2-Stable
Merge branch 'master' into 5.2-Stable
Merge commit 'ce04e85bb70c6f35ff4762a0c002d11bffd61274' into 5.2-Stable
Merge commit '5fcdd74530246f7c2dab28ebe66fc9e7695a7270' into 5.2-Stable
Merge commit '837c77fa9c81c3107ea1d06cf99a0ce209f2aa4c' into 5.2-Stable
Add support for username and password to thinstaiton.packages
	modified:   ts/5.2/packages/base/etc/thinstation.packages