Merge "Make bootjars work with OUT_DIR & friends"