Set logs location in /var/log/openshift/console/httpd as the broker httpd
Add the PassengerRuby parameter to avoid an error while searching libruby 1.9.3
Configuration file 'console.conf' was placed in the wrong location: httpd/conf instead of httpd
Bug 902181 - Should wrap domain input element where possible
Sync usage fixes
Bug 911322
Bug 917990 - Multiple fixes.
BZ896363 - 'the User Guide' link should redirect to an existing url

Conflicts:

	openshift-console/app/helpers/console/help_helper.rb
BZ913376 - The favicon cannot be displayed
Merge pull request #1561 from lnader/master

Bug 911322
Merge pull request #1560 from rmillner/US3143

Bug 917990 - Multiple fixes.
Merge pull request #1554 from smarterclayton/bug_902181_should_wrap_domain_element

Merged by openshift-bot
Fixed a regression where DEFAULT_GEAR_CAPABILITIES was not being used to populate cloud user default capabilities.
Merge pull request #1563 from calfonso/master

BZ913376 - The favicon cannot be displayed and BZ896363 - 'the User Guide' link should redirect to an existing url
Move REST API cartridge test to misc1 group

Move the cartridge test to the misc1 group to avoid race conditions
arising from the use of with_scalable_app in different test suites.
Merge pull request #1565 from pmorie/dev/cart_test

Move REST API cartridge test to misc1 group
Merge pull request #1562 from kraman/default_gear_sizes_2

Fixed a regression where DEFAULT_GEAR_CAPABILITIES was not being used to populate cloud user default capabilities
Bug 918480
Merge pull request #1559 from pravisankar/dev/ravi/usage-fixes

Merged by openshift-bot
Bug 918501