Set correct ClassLoader for app initialization
Test for correct classloader during app init
Merge branch 'S4-68' into dev