22313, install script changes
Merge pull request #1186 from jgunderson/22313

22313, install script changes