[BISERVER-10103] - Initial solution import now imports plugin-samples
Merge branch '5.0-CE-Dev' of github.com:webdetails/pentaho-platform into 5.0-CE-Dev