Revert "cherry picks"

This reverts commit 1c395fe4.
4 jobs for Development_2.x-Beta in 1 minute and 10 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Lint
passed #1056
lint:lint-php5.4

00:00:41

passed #1057
lint:lint-php5.6

00:00:37

passed #1058
lint:lint-php7.0

00:00:38

 
  Codesniffer
passed #1059
codesniffer

00:00:29