Merge branch 'add_support_for_db_environment' into 'master'

Add helper property to get the environment configured for the database

See merge request !74