Fix #153: use merged trust store from internal and system keystores

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'master' into smack4