Merge "BBQ: Attach calling thread to jvm if needed" into tm-qpr-dev