Merge proposals dependent on lp://staging/~dpm/reminders-app/switch-to-production-cmake-improvements

1. switch-to-production-cmake-improvements
2. Dependent merge proposals