Merge pull request #425 from edx-solutions/release

Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt

lms/djangoapps/social_engagement/engagement.py

@@ -113,11 +113,11 @@ def _compute_social_engagement_score(social_metrics):
         'SOCIAL_METRIC_POINTS',
         {
             'num_threads': 10,
-            'num_comments': 2,
-            'num_replies': 1,
-            'num_upvotes': 5,
+            'num_comments': 15,
+            'num_replies': 15,
+            'num_upvotes': 25,
             'num_thread_followers': 5,
-            'num_comments_generated': 1,
+            'num_comments_generated': 15,
         }
     )
 

lms/djangoapps/social_engagement/tests/test_engagement.py

@@ -215,7 +215,7 @@ class StudentEngagementTests(TestCase):
 
             self.assertEqual(
                 leaderboard_position['score'],
-                24
+                85
             )
 
             self.assertEqual(
@@ -264,7 +264,7 @@ class StudentEngagementTests(TestCase):
 
         self.assertEqual(
             leaderboard_position['score'],
-            24
+            85
         )
 
         # user should be in place #2
@@ -282,7 +282,7 @@ class StudentEngagementTests(TestCase):
 
         self.assertEqual(
             leaderboard_position['score'],
-            48
+            170
         )
 
         # user2 should be in place #1