CB-6322 Simplify platforms/platform code for platform specifics

https://issues.apache.org/jira/browse/CB-6322