am 351f28e2: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev

* commit '351f28e2e71bef7fab42ec36150b7973fd4ef139':
  Load crypto plugins from additional shared libraries