MOBI-759 replicate what was done on 1.3.0 branch

git-svn-id: http://anonsvn.icesoft.org/repo/icemobile/trunk/icemobile@35911 1de00972-ac04-4911-a46b-06793c8d78d9