Sync cordova commit 58cfa4751b971bd851e44b05b0dc3e3a958f6aee

CB-5397 Add a --cli option to bin/create that has ../../www/
../../merges/ within the project
Sync cordova commit 806651d674a970a7d22ed9c3132f206d88594f0c

Copy config.xml within copy-www-xface3-step.sh instead of in Copy
Resources step

Related to CB-5397.
This will allow users to delete the "Staging" group within a CLI project
without breaking their builds. They may want to do this so that there
isn't any confusion when between staging vs. non-staging when doing a
Quick-Open (Command-Shift-O).
Eliminate xFaceLib project warnings
Removed unused macros from XConstants
Removed unused "UIDevice+Additions"
Removed macro SYSTEM_VERSION_NOT_LOWER_THAN from XConstants, use IsAtLeastiOSVersion() instead.
updated res from default-app before 3.2.0-rc1 release
Set VERSION to 3.3.0-dev (via xsrc)
[doing-284] Update JS snapshot to version 3.3.0-dev (via xsrc)
Removed engine_build and security_address from config.xml. These preferences should be added only when needed.