Merge branch '2.7.x'

• 2.7.x: (#11764) Fix failing cron test Fixup two space merge conflict from 2.7.x => master Retry inventory ActiveRecord transaction failure (#11717) Set password before creating user on Windows (#11293) Add password get/set behavior for 10.7 (#11764) Fix cron jobs for passing block to method (#11740) Disable failing test on Windows Revert "Access user password hash in OS X 10.7" Access user password hash in OS X 10.7 (#11741) Use dns_alt_names instead of certdnsnames in acceptance tests