removing non-working attempt to add compile-time features in protractor conf
merging changes