Update ArticleFeedbackv5 to master

Change-Id: I4119dacfd5c75ccf8328494c9190bb42d540dc76
Merge "Update ArticleFeedbackv5 to master" into wmf/1.21wmf12