Release beta Mambu 2.0 (v1.17 build 21)

Fixes and enhancments for preparing Mambu Mobile Release 2.0 beta