fixes for non gui application

Issue-ID: PORTAL-909
Signed-off-by: Muni Mohan Kunchi <munmohan@att.com>
Change-Id: Ia006bc755760641c6501a531f95013d04c93427f
3 files changed