[BISERVER-11504] - Updating pom, assembly with new pentaho-server-core-features.xml location
Merge pull request #1 from brosander/BISERVER-11504

[BISERVER-11504] - Updating pom, assembly with new pentaho-server-core-features.xml location
[BACKLOG-207] - Updating ce distro to have 2 descriptors, 1 for server, 1 for client, adding changes to get it working in kettle osgi bridge, fixed log4j errors
Merge pull request #2 from brosander/BACKLOG-207

[BACKLOG-207] - Updating ce distro to have 2 descriptors, 1 for server, ...
[BACKLOG-207] - Fix to http bundle version, removed duplicate plugins from pom
Merge pull request #3 from brosander/BACKLOG-207

[BACKLOG-207] - Fix to http bundle version, removed duplicate plugins fr...
[BACKLOG-207] - Changing features naming
Merge pull request #4 from brosander/BACKLOG-207

[BACKLOG-207] - Changing features naming
[BACKLOG-207] - Only overriding startup.properties in client
Merge pull request #5 from brosander/BACKLOG-207

[BACKLOG-207] - Only overriding startup.properties in client
[BACKLOG-394] Adding monitoring classes