Squashed commit of the following:

commit 7fbf1f71680fac105ada32406d3e078055c7d874
Merge: 6ec8bdf 81158ca
Author: Bob Silverberg <bob.silverberg@gmail.com>
Date:   Wed Dec 4 10:28:42 2013 -0500

    Merge branch 'bug_930932_v1.2' of https://github.com/viorelaioia/gaia into pr13348

    Conflicts:
    	tests/python/gaia-ui-tests/gaiatest/tests/functional/keyboard/manifest.ini

commit 81158cae9dc39cf1818e8e63acf0f8cb04686f2b
Author: Viorela Ioia <viorelaioia@gmail.com>
Date:   Wed Nov 27 11:01:07 2013 +0200

    Bug 930932 - [v1.2] Write a test to use the Keyboard's predictive text