Mas 2018 0050

As agreed in MAS#35.

Lets first discuss MAS-2018-0047. Perhaps we need to apply this CR to the file with the same name in the new directory structure.

mentioned in commit c49c7282

Status changed to merged

I merged the CR, but there is the issue that it effected only files in the SDT/schema3.0 directory, but not in the SDT/schema4.0 directory. Will you make a new pull request or should I copy the changes by hand?

Reassigned to @yongjing

I'm actually working on an other CR of removing 'Module' at all according to our previous discussion. So no need to do it for 4.0 right now until we agree on the new solution.