Fixed problems with merging profile-defined properties into the project, and fixed the ITs testing profile definitions in the process. This should finally resolve MNG-421