Update dependencies and refactor serverless/test imports#140

mnapoli merged 2 commits intooss-serverless:mainoss-serverless/serverless:mainfrom

punit1108:mocha_depspunit1108/serverless:mocha_depsCopy head branch name to clipboard