Fixed a unit test or two; cleaned up warnings;
Align to Stringprep changes in Emite
Merge remote-tracking branch 'origin/master' into PlanB
Build changes.
Merge remote-tracking branch 'origin/dwd/PlanB' into PlanB