JBIDE-14844 to master build-sites
JBIDE-14844 updates as per nboldt's comments