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

SOS-1666
SOS-1570
SOS-1696
SOS-1695
SOS-1693