Port some changes from the main branch ( now entity tests pass ) Since embed should run in ant1.5 - I duplicated some of the new methods in ant16. If ProjectHelper2 will move to the main branch this needs to be removed ( and some other stuff too ) PR: Obtained from: Submitted by: Reviewed by: