Merge pull request #926 from rsvato/master

UI fixes (scheduled upgrades)
[RJA-2128][fix]: Select template dialog - exchange 'Cancel' and 'Select' button positions
'Cancel' is default button now
Merge pull request #928 from ddurnev/master

[RJA-2128][fix]: Select template dialog - exchange 'Cancel' and 'Select'
[RJA-2138][feature] - Add only required properties to a new databag/env config