Merge branch 'v2.0' 28/1728/1
authorvelandy <rajesh.velandy@riftio.com>
Fri, 28 Apr 2017 13:33:18 +0000 (09:33 -0400)
committervelandy <rajesh.velandy@riftio.com>
Fri, 28 Apr 2017 13:35:17 +0000 (09:35 -0400)
Change-Id: Ie77b962ca0ae4e57c4e2af1624e804175ac702fc
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge