Minor fixes from 2.1 release meeting.

Change-Id: If259c406184a6ae3c71da716534f81e87f8d2596
Signed-off-by: Marek Potociar <marek.potociar@oracle.com>