RCM-64
SQL Cohort builder -- SQL query note
TRUNK-4300 - OpenmrsCookieThemeResolver should never throw an exception, because that would break the uncaughtException page

(cherry picked from commit cf9f6e1f29d66fab9e80ffc7723f461fa3327b22)