Merge pull request #26 from twiindan/master

Acceptance Test refactoring for catalog features
Merge remote-tracking branch 'upstream/develop' into feature/installation_tests