Merge branch 'cas-support-cql', remote-tracking branch 'upstream/cas-support-cql' into cas-support-cql
Make compilation successful with CDH4