[UPDATE] Enhance full-os and core samples
Merge branch '3.6' of ssh://10.199.99.148/home/changegit/repository/modules.sample into l3.6