Make build compatible with wavemaker 6.7.0