In multinodes mode do not rely on system variables in XSL to access data dirs #559.
Merge remote-tracking branch 'upstream/stable-develop' into develop