Align with smx rel and xalan versions.
Merge remote-tracking branch 'origin/master'