Merge pull request #600 from bhariharan/unstable

Merge from 'master' to unstable
Some fixes to the forcedroid package
Merge pull request #601 from khawkins/update_package

Some fixes to the forcedroid package
Looking at issues with building the package from CI
Merge pull request #603 from khawkins/fix_package_build

Looking at issues with building the package from CI
Fixing token refresh intent
Merge pull request #604 from bhariharan/master

Fixing token refresh intent
Merge branch 'master' into unstable