Switched to using webjars and load jquery accordingly
Merge branch 'develop-webjars' into develop