Various Fixes for Strata Theme and Social Office (Pull for CE Trunk) SET 2

SOS-1684
SOS-1685
SOS-1688