Fixed integration testing issues.
Fixed broken pointer to mapping resource.
Merge branch 'maven' of github.com:lintool/Cloud9 into datatypes-removal