Resolving EMBPD00153134
Merge pull request #420 from rhomobile/jrq768_eb1.1_cqcm_fixes_from_master

Fixes in Rhodes Repository for EB 1.1