Resolving EMBPD00153134
Merge pull request #419 from rhomobile/jrq768_eb1.1_cqcm_fixes_from_EB

Fixes in Rhodes repository for EB 1.1