Updated to handle refresh-token

did this manually to avoid the complexities of a full merge.
resolved conflict from master