Merge remote-tracking branch 'upstream/master' into devel

Conflicts:
    engines/bastion/app/assets/bastion/products/views/products.html
    engines/bastion/app/assets/bastion/systems/details/system-subscriptions.controller.js
    engines/bastion/app/assets/bastion/systems/systems.controller.js