Restructured key import infrastructure.
Reorganisation of Master Key generation.
Several clean-ups on token-specific function hooks.

Signed-off-by: Ingo Tuchscherer <ingo.tuchscherer@linux.vnet.ibm.com>