refs #6463 - hammer was unable to update the org's desc, BZ 1114136
Fixes #8013: Rely on factory_girl_rails and mocha version from Foreman.
Merge pull request #4748 from komidore64/rmi6463-organization-desccriptification-station

refs #6463 - hammer was unable to update the org's desc, BZ 1114136
fixes #7996 - don't index users in elasticsearch
Merge pull request #4759 from ehelms/fixes-8013

Fixes #8013: Rely on factory_girl_rails version from Foreman for consist...
Merge pull request #4756 from stbenjam/7996

fixes #7996 - don't index users in elasticsearch