Sync between master and dev-1.18

This PR contains sync up between master and dev-1.18 and also reolsved merge conflicts occured during previous sync during previous sync up caused due to missed adding tide-method merge Signed-off-by: vineeth <vineethpothulapati@outlook.com>
2020-02-14 01:30:05 +05:30
parent 63f30b086a 669bf498a9
commit 9433b26564
37 changed files with 1287 additions and 433 deletions
@@ -50,7 +50,6 @@ aliases:
    - kbhawkey
    - makoscafee
    - Rajakavitha1
-    - ryanmcginnis
    - sftim
    - steveperry-53
    - tengqm