Merge "Adding ability for keystore to find dropbox" into pi-dev