Merge branch 'develop'

* develop:
  Update README with rehash info
  Add develop back to travis build branches
  Add customer rehash unit tests
  Ensure consistent options when evaluating rehash
  Initial, POC implementation of customer password rehash
  Remove develop build status from readme
  Remove develop from travis branch build list
  Add rehash system config
Fix customer rehash tests to accommodate both CE and EE
Merge branch 'master' into develop

* master:
  Fix customer rehash tests to accommodate both CE and EE