Merge branch 'v2.0' 41/1641/1
authorvelandy <rajesh.velandy@riftio.com>
Fri, 21 Apr 2017 20:20:20 +0000 (16:20 -0400)
committervelandy <rajesh.velandy@riftio.com>
Fri, 21 Apr 2017 20:21:39 +0000 (16:21 -0400)
Change-Id: Ic4b78fe1dce04ab05586fb268e908d61f63360da
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge