MAGETWO-33622: Junior+ Developer Workflow

- merge fixes

Author: Pavlo Cherniavskyi

lib/internal/Magento/Framework/View/Page/Config/Renderer.php

@@ -384,7 +384,7 @@ protected function renderAssetHtml($template, $assets)
             foreach ($assets as $asset) {
                 /** @var $asset \Magento\Framework\View\Asset\File */
                 // todo will be fixed in MAGETWO-33631
-                if ($this->appMode != \Magento\Framework\App\State::MODE_PRODUCTION) {
+                if ($this->appMode == \Magento\Framework\App\State::MODE_DEVELOPER) {
                     if ($asset instanceof \Magento\Framework\View\Asset\File &&
                         $asset->getSourceUrl() != $asset->getUrl()
                     ) {