Minor updates to lessen impact of settings-tree merge.
Minor updates to lessen impact of settings-tree merge.

JDeuce/webassets,glorpen/webassets,JDeuce/webassets,heynemann/webassets,aconrad/webassets,aconrad/webassets,scorphus/webassets,john2x/webassets,glorpen/webassets,florianjacob/webassets,wijerasa/webassets,heynemann/webassets,aconrad/webassets,florianjacob/webassets,scorphus/webassets,glorpen/webassets,wijerasa/webassets,heynemann/webassets,john2x/webassets