* JAVA-6403: Fix references to parents * JAVA-6403: removed relativePath
* #BAEL-4654 * Fixing PR comments.