forj cloud framework improved

Change-Id: Ia2f26758d8458141045c702ee313bfd82aa138eb