Fix bug 980953 - allow conversion tracking
Bug 913809 - Proper psql error handling

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

This adds some extra error handling when using psql in a scaled application if the database server is stopped.
Console: Make sure excluded_tags is set

When listing the custom cartridge type (i.e., the diy cartridge), make
sure that excluded_tags in case it was not set earlier.  This commit
fixes bug 982882.
Merge pull request #3033 from BanzaiMan/dev/hasari/bz974983

Merged by openshift-bot
Bug 980487: Add jboss-cli.sh to the jboss* cartridges
Bug 968252: Clean up old marker README files
Merge pull request #3035 from kraman/bugfix

Merged by openshift-bot
Fix ApplicationStateFunctionalTest for F19
so that it creates test user in /var/tmp-tests instead of /tmp.
This avoids any poly-instantiated /tmp errors.
Bug 979740 - Fix Postgres cartridge using $HOME

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

The Postgres cartridge was using $HOME in some places, but it should be using $OPENSHIFT_HOMEDIR.
This is causing an unbound variable error.
Merge pull request #3034 from fotioslindiakos/BZ913809

Merged by openshift-bot
Merge pull request #3038 from ironcladlou/bz/980487

Merged by openshift-bot
oo-admin-ctl-domain: don't use CloudUser.new

Instead, use CloudUser.find_or_create_by_identity, which is now the
correct way to create a new account.
Bug 981528

reload/force-reload depends on application status, so both can be sent
to the cartridge
Changing error message to make it more clear
Bug 973796 - PassengerPreStart points at root which logs errors
Merge pull request #3036 from liggitt/bug_980953_adwords_script

Merged by openshift-bot
Bug 983216: Use rsync for jbossews deployments rather than mv
Bug 982054

$OPENSHIFT_REPO_DIR is cleaned up before pre-build() function is
invoked, so we were simply saving away an empty directory.

Move this logic to a correct phase of the build cycle, and we really
save away the installed modules.
Removing extra lsof dependency
WIP Cartridge - bump cartridge versions