Merge pull request #875 from akeneo/flexible/prepare_removing

FlexibleEntityBundle / CatalogBundle mark methods as deprecated
Fix checkstyle and phpdoc