Bug 927062 - Remove the 'add call' button when in CDMA call waiting mode r=etienne
Bug 915081 - Hide the end-and-answer button during CDMA call waiting r=etienne

- Removed the end-and-answer button when in CDMA call waiting mode as it
  does not support ending the first call and answering the other one,
  the hold-and-answer button is enlarged to fill up the entire container
  under these conditions
- Added unit-tests covering the changes
Merge pull request #12322 from davidflanagan/autocorrect-config

Bug 884752: configure keyboard layouts and dictionaries at build time r=janjongboom,luke-chang,aus(cherry picked from commit 38456b0b9ee903e597d2a2fd949c10fd673e1993)

Conflicts:

	Makefile
	apps/keyboard/js/keyboard.js
Merge pull request #12947 from davidflanagan/bug884752-v1.2

Merge pull request #12322 from davidflanagan/autocorrect-config 
Uplifts bug 884752 to v1.2