Merge branch 'airport-it-test-fix' into 'milestone-2'

added mocked airportMessagingService to the rest controller integration test

See merge request !37