Merging native/auth refactor into bootstrap_updates

Here's another standalone pull request, that simply encapsulates the merge of the native / auth refactor feature branch code into bootstrap_updates.  It will be desired for some of the bootstrap changes to be made.