Remove unneeded entries from apache.default
Update dev-* to use AtoM stable/1.3.x