DEVEN-175: change import from unittest2 to unittest in integration tests
Merge remote-tracking branch 'origin/master'