Merge "Remove jobscheduler-framework"