[SettingsBundle] use actions.update macro in update template
Allow logging by username or email
Rename `$properties` argument to `$attributes`

Additionally remove references to 'product' from docblock descriptions.
Some method has been renamed to be consistent
Merge pull request #1803 from kayue/fix/user-email-canonical

Allow logging by username or email
Merge pull request #1771 from aRn0D/fix/methodname

Some method has been renamed to be consistent
Adding a resource form type
Merge pull request #1791 from jrobeson/use-action-update-in-settings-bundle-update

[SettingsBundle] use actions.update macro in update template
Merge pull request #1797 from adamelso/attribute-interface-subject-agnostic

Improvements to the attribute subject interface descriptions and setAttributes method argument name.
Merge pull request #1772 from aRn0D/resource/base-form

[WIP] Adding a resource form type
Fix behat context & fixtures after latest merges
Merge pull request #1809 from stloyd/bugfix/broken_behat

Fix behat context & fixtures after latest merges