Fix proxy error condition and simplify method

Add new minion proxy test case.
Merge pull request #808 from smarterclayton/minion_proxy_test

Fix proxy error condition and simplify method
Merge branch 'master' into cleanup
backed off manifest v. change