AMBARI-6229. After enabling security on cluster with OpenJDK7 can't start any component. This commit reverts d228ca90b6664a26b3df22a206179200cd0a1050 and c6d86439f70edc07e14dd0986b690b62cfe25a43 commits. (jaimin)