Merge from 'origin/develop' branch.
fix r2rml writer space in mapping id