NOTICKET: Fix issues caused by merge
authorKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Thu, 20 Apr 2017 14:59:43 +0000 (10:59 -0400)
committerKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Thu, 20 Apr 2017 14:59:43 +0000 (10:59 -0400)
Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>

No differences found