Back ported avatars fix from release-215 branch; merged pull request #3100 from Wikia/CONN-439

CONN-439
Conflicts:
	extensions/wikia/UserProfilePageV3/Masthead.class.php