Diverse updates. Main: solves Import-Service issues with jpm (and potentially others)



Signed-off-by: Peter Kriens <peter.kriens@aqute.biz>