Merge branch 'i-fix-conditions' into 'master'

Fix conditions

See merge request atrocore/atrocore!1444

Merge branch 'i-a01k71g5zxfectam88g3ssefjtn-fix' into 'rc-2.1.17'

I a01k71g5zxfectam88g3ssefjtn fix

See merge request atrocore/atrocore!1398

Merge branch 'i-a01k71g5zxfectam88g3ssefjtn-fix' into 'rc-2.1.17'

I a01k71g5zxfectam88g3ssefjtn fix

See merge request atrocore/atrocore!1398

.

.

.

.

Merge branch 'i-a01k1j6jbgxe82v7bx75djg63f0-fix2' into 'master'

.

See merge request atrocore/atrocore!1259

Merge branch 'b-2.0.28' of gitlab.atrocore.com:atrocore/atrocore into…

… b-2.0.28

.