Merge "removing deprecated jjbs"