Fixed build of crypto plugin using uuid lib (was not declared using C linkage)
Merged changes from JB4.2 branch (indent and test DRM UUIDS added)