Cleanslate fixes for https://www.pivotaltracker.com/story/show/13647031
Cleanslate fixes for https://www.pivotaltracker.com/story/show/13647031

eloquence/unisubs,ReachingOut/unisubs,pculture/unisubs,pculture/unisubs,ofer43211/unisubs,norayr/unisubs,pculture/unisubs,ujdhesa/unisubs,eloquence/unisubs,wevoice/wesub,ReachingOut/unisubs,ReachingOut/unisubs,wevoice/wesub,ReachingOut/unisubs,ofer43211/unisubs,norayr/unisubs,pculture/unisubs,ujdhesa/unisubs,ofer43211/unisubs,eloquence/unisubs,norayr/unisubs,ofer43211/unisubs,ujdhesa/unisubs,ujdhesa/unisubs,eloquence/unisubs,norayr/unisubs,wevoice/wesub,wevoice/wesub