Add 'default' profile to ensure tests are run on Travis
Only append client_id a resource id if it is not null
https://www.pivotaltracker.com/story/show/84043514
[#84043514]
Merge branch 'feature/fix_jdbc_profile_for_tests' into develop
https://www.pivotaltracker.com/story/show/84043514
[#84043514]