Merge pull request #893 from e-liner/garrison_update

Moving back garrison version to fix hardware bug