PDI-6779 - Importing job to EE Repository adds directory to trans or job detail screen even if using variable
PDI-6779 - Importing job to EE Repository adds directory to trans or job detail screen even if using variable - test
PDI-5601 - ability to create duplicate sub folders in PDI EE Repository - fixed contains method
Merge pull request #647 from MikhailGorbachev/PDI-5601

PDI-5601 - ability to create duplicate sub folders in PDI EE Repository
Merge pull request #643 from AndreyBurikhin/PDI-6779

PDI-6779 - Importing job to EE Repository adds directory to trans or job detail screen even if using variable
PDI-5203 - In Kettle's Repository Explorer, version history is not refreshed when an object is renamed
Merge pull request #650 from AndreyBurikhin/PDI-5203

PDI-5203 - In Kettle's Repository Explorer, version history is not refreshed when an object is renamed
PDI-3064 - junits for regression fix

	modified:   engine/test-src/org/pentaho/di/trans/steps/mapping/MappingParametersTest.java
PDI-3064 -  Mapping / Sub-transformation doesn't pick up named parameters defined in parent if they are also defined in the subtrans

fix regresion. Mapping transformation must correctly pass variables from
parent to child transformation according to 'Inherit variable' checkbox
mode.
[PDI-10591]: NPE and exposed exception on the DI-Server/Carte status page when the repository is not correctly defined (or repositories.xml is not accessible) - exception is not logged in the pentaho.log nor any tomcat\logs

The fix consists of two minor changes:
1)In the case when the repository is not correctly defined (or repositories.xml is not accessible) the page will display the short message: Unable to connect to repository:<Repository_Id>;
2)Added logging for the exception (with full stacktrace ) into pentaho.log

There is no any changes in logic of processing data in GetStatusServlet just minor tune so there is no need in unit tests.
Merge pull request #653 from stepanovdg/PDI-10591

[PDI-10591]: NPE and exposed exception on the DI-Server/Carte status pag...
Merge pull request #652 from prakapenka/PDI-3064v2

PDI-3064 (fix regression) Mapping / Sub-transformation doesn't pick up named parameters defined in parent if they are also defined in the subtrans
PDI-5202: Before creating a directory, check if a directory with that same (case-insensitive check) name already exists in the repo. If it does, produce a warning, and add that existing directory to the ui. If not, create the directory in the repository before adding it to the ui.
Merge pull request #659 from rpbouman/PDI-5202

PDI-5202: Before creating a directory, check if a directory with that sa...
PDI-5202: Prevent prompting the user twice in case the dir exists already in the UI. checkstyle fixes.
Merge pull request #660 from rpbouman/PDI-5202

PDI-5202: Prevent prompting the user twice in case the dir exists alread...
Updated build.properties to set feature-branch version for artifacts
[CLEANUP]Fixed typo in method parameter
[BACKLOG-257]Allow database extra option defaults

Get default options from database type and display.
Only options of the current connection type should be added to the options panel.

http://jira.pentaho.com/browse/BACKLOG-257
[BACKLOG-257]Configuration of PDI JDBC

General UI enhancements:
    Apply default port 9080, hide database name field.
    Rename database type for suite conformity.
    Add webappname -> pentaho-di as default option

http://jira.pentaho.com/browse/BACKLOG-257