UserStory#2415 : Fixes to fully transfert lib-forj to lorj in forj cli.

Change-Id: I9da4d92136223738cabb390210ba66ef7e8b4517