ACTIVEMQ6-3 Restoring directories removed by accident on previous commit

https://issues.apache.org/jira/browse/ACTIVEMQ6-3

These directories were removed by accident... restoring them now
Merge #11