pkinit-support branch has been merged to trunk

[Zheng, Kai]

Thanks Jiajia for getting the most of the codes done and merging it to 
trunk(master)!

Let's continue to get the great feature delivered based on trunk, the way can 
save us some time avoiding having to maintain two branches.

Regards,
Kai