merge role_hier branch into master, role_hier will be deleted after  this commit. And no role hierarchy will be imported any more.
merge role_hier branch into master, role_hier will be deleted after 
this commit. And no role hierarchy will be imported any more.
darren-wang/ks3,darren-wang/ks3