Fixes for KARAF-147, KARAF-148, KARAF-149

[Adrian Trenaman]

Hi Devs,

Have provided patches for above issues on the JIRA. Would be grateful if 
someone could commit.

Best,
Ade.