spaces to tabs (normally you use tabs in ant-file - eclipse does it so ...)
add isPipeRegistered for mods to check if pipe-id already taken.
Merge branch 'upstream' into 1.5.2

Conflicts:
	build.xml