Issue 14304: add proxy parameter to gem state
Fix gem unit test with new proxy parameter
correct invalid xmlrpclib auth
Add integration test for logging out of the rest_cherrypy app
Don't process request data on logout for rest_cherrypy module

There is no request data when logging out so this was returning a 500
reponse.

Fixes #15015
Fixes for boto_elb for VPC
Ensure both availability_zones and subnets are not provided
Return vpc_zone_identifier properly from get_config

We take a list for vpc_zone_identifier as an input, but get_config
returns a comma delimited string. We need to massage the output.
Fixing returners that use configuration options from config.options to work as returners for the salt schedulers.  The __salt__ variable is unavailable when the returner is run from a scheduled job so we pull the configuration values out of __opts__ instead.
Update 'doc/.tx/config' - Build #144

  http://cookingwithsalt.org/job/salt/job/transifex/144/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge branch '2014.7' into develop
Merge pull request #14975 from jhenry82/issue_14304

Issue 14304: add proxy parameter to gem.installed state
Merge pull request #15001 from sylphid8/patch-1

correct invalid xmlrpclib auth
Merge pull request #15011 from garethgreenaway/schedule_returner_fix

Fixes to returners.
Merge pull request #15016 from whiteinge/netapi-fix-logout

Add tests and a fix for the rest_cherrypy logout view
Merge pull request #15029 from lyft/HOTFIX-botoelb-vpc-fixes

 Fixes for boto_elb for VPC
Include dependency required for debconfmod.
Merge pull request #15030 from lyft/botoasg-vpc-fixes

Return vpc_zone_identifier properly from get_config
correct invalid xmlrpclib auth

Same as #15001, but for pillar this time.
Add salt interface config item