PSR2 compliance changes
Merge branch 'release/1.4' of github.com:openeyes/OphTrConsent into release/1.4