merge changes for storm-1535

...ew/app_settings/shaders/class1/deferred/softenLightF.glsl

.../app_settings/shaders/class1/deferred/softenLightMSF.glsl

...ew/app_settings/shaders/class1/interface/solidcolorF.glsl

...tings/shaders/class1/objects/fullbrightShinySkinnedV.glsl

...p_settings/shaders/class1/objects/fullbrightSkinnedV.glsl

..._settings/shaders/class1/objects/shinySimpleSkinnedV.glsl

...w/app_settings/shaders/class1/objects/simpleSkinnedV.glsl

...ew/app_settings/shaders/class2/deferred/softenLightF.glsl

.../app_settings/shaders/class2/deferred/softenLightMSF.glsl

...ew/app_settings/shaders/class3/deferred/softenLightF.glsl

indra/newview/lldrawpoolwlsky.cpp

indra/newview/llvosky.cpp

indra/newview/pipeline.cpp