Merge "Services: Convert BlockManager's static to a const now HHVM is gone" into...

diff --combined includes/ServiceWiring.php
index 4692d05,7f60c66..860edfd
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -116,7 -116,7 +116,7 @@@ return 
        'BlockManager' => function ( MediaWikiServices $services ) : BlockManager {
                return new BlockManager(
                        new ServiceOptions(
-                               BlockManager::$constructorOptions, $services->getMainConfig()
+                               BlockManager::CONSTRUCTOR_OPTIONS, $services->getMainConfig()
                        ),
                        $services->getPermissionManager(),
                        LoggerFactory::getInstance( 'BlockManager' )
@@@ -545,7 -545,7 +545,7 @@@
        'PermissionManager' => function ( MediaWikiServices $services ) : PermissionManager {
                return new PermissionManager(
                        new ServiceOptions(
 -                              PermissionManager::$constructorOptions, $services->getMainConfig()
 +                              PermissionManager::CONSTRUCTOR_OPTIONS, $services->getMainConfig()
                        ),
                        $services->getSpecialPageFactory(),
                        $services->getRevisionLookup(),