Update build script for update maven-support.gradle script.
Merge remote-tracking branch 'origin/dev' into dev