Fix various small issues left behind branch cut 35/32835/1
authorVratko Polak <vrpolak@cisco.com>
Fri, 15 Jan 2016 16:51:13 +0000 (17:51 +0100)
committerVratko Polak <vrpolak@cisco.com>
Fri, 15 Jan 2016 16:51:13 +0000 (17:51 +0100)
Change-Id: If8dbe63ddc26f4ebcc08b5db2149e227a7f2c162
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

No differences found