Issue 14304: add proxy parameter to gem state
Fix gem unit test with new proxy parameter
Fix merge conflicts I missed
Merge pull request #15250 from saltstack/bp-14975

Backport #14975 to 2014.7