Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev