[JBIDE-15261] creating app with embedded cartridges + larger timeout

Now creating the app with embedded cartridges (was: adding cartridges to
the freshly created app). Also using specific, long timeout when
creating an app.
[JBIDE-15261] creating app with embedded cartridges + larger timeout

Now creating the app with embedded cartridges (was: adding cartridges to
the freshly created app). Also using specific, long timeout when
creating an app.
Merge branch 'JBIDE-15261-41' into jbosstools-4.1.x

Conflicts:
	plugins/org.jboss.tools.openshift.express.client/.classpath
	plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
	plugins/org.jboss.tools.openshift.express.client/build.properties
	plugins/org.jboss.tools.openshift.express.client/pom.xml