Adding final release for build 2605
Merge branch 'master' into develop

Signed-off-by: Adam Stegman <astegman@pivotallabs.com>

Conflicts:
	Gemfile.lock
Promote artifacts before merging master back into develop.

Signed-off-by: Adam Stegman <astegman@pivotallabs.com>
Refactored resource pool tests & Re-enabled deprecation warnings

Signed-off-by: Adam Stegman <astegman@pivotallabs.com>
minor clean up of resource pool usage in assembler

Signed-off-by: Adam Stegman <astegman@pivotallabs.com>
switch to skip for travis mysql tests

Signed-off-by: Dawn Song <d.song@pivotallabs.com>