[OEM-174] Remove optional elements rendering from view template
Update RELEASE notes
[OEM-176] fixed bug where setting the type to anything other than 1 is not saved (or more accurately is saved but is never displayed as anything other than 1)
Merge branch 'master' into jira/OEM-176
Update RELEASE notes
Merge branch 'master' into release/1.6-orbis