Fix issues w/ V1 stop lock
Bug 957073
Merge pull request #2252 from danmcp/master

Merged by openshift-bot
Merge pull request #2251 from pmorie/dev/v1_stop_lock

Merged by openshift-bot
Bug 956625 - Updating to precompile the origin console assets during RPM build

https://bugzilla.redhat.com/show_bug.cgi?id=956625

Removed precompiled assets from the repo.
Updated the SPEC file to precompile the assets at build time.
Fixed httpd/console-scl-ruby193.conf to call console_ruby instead of
broker_ruby.
Changes to Gemfile, Rakefile and config/application.rb to support
precompiling the assets at build time.
Add health urls to each v2 cartridge.
Bug 956651
Bug 956050 956043
Merge pull request #2256 from detiber/bz956625

Merged by openshift-bot
Merge pull request #2257 from rmillner/online_runtime_264

Merged by openshift-bot
Card online_runtime_287 - Bug fix

* mv Perl template to cartridge/usr/template

Conflicts:
	node/lib/openshift-origin-node/model/application_repository.rb
Merge pull request #2258 from bdecoste/master

Merged by openshift-bot
Merge pull request #2261 from jwhonce/wip/card287

Merged by openshift-bot
Card online_runtime_239 - Download cartridge from URL

* Refactor Node to accept manifest from Broker on Configure
Merge pull request #2262 from jwhonce/wip/cartridge_from_url

Merged by openshift-bot